mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiple partial consume from BufferList (#8007)

Browse Source 
* Add test for multiple partial consume from BufferList

This shows the problem indicated in #7385

* Fix multiple partial consume from BufferList

The JSUint8Array::possiblySharedBuffer() returns the backing array,
not taking into account the byteOffset that indicates the start of
the data in the backing array. This means that when creating an array
with the same backing array, the current byteOffset needs to be added
to the start of the new slice.

This led to consume() returning the same data when repeatedly consuming
small numbers of bytes from the BufferList.
This commit is contained in:
hborchardt
2024-01-06 07:25:01 +01:00
committed by GitHub
parent bfe8afd674
commit eb84ebf974
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bun.js/bindings/JSBufferList.cpp
View File

@@ -182,8 +182,9 @@ JSC::JSValue JSBufferList::_getBuffer(JSC::VM& vm, JSC::JSGlobalObject* lexicalG
}
if (n < len) {
auto buffer = array->possiblySharedBuffer();
JSC::JSUint8Array* retArray = JSC::JSUint8Array::create(lexicalGlobalObject, subclassStructure, buffer, 0, n);
JSC::JSUint8Array* newArray = JSC::JSUint8Array::create(lexicalGlobalObject, subclassStructure, buffer, n, len - n);
auto off = array->byteOffset();
JSC::JSUint8Array* retArray = JSC::JSUint8Array::create(lexicalGlobalObject, subclassStructure, buffer, off, n);
JSC::JSUint8Array* newArray = JSC::JSUint8Array::create(lexicalGlobalObject, subclassStructure, buffer, off + n, len - n);
m_deque.first().set(vm, this, newArray);
RELEASE_AND_RETURN(throwScope, retArray);
}
@@ -207,7 +208,8 @@ JSC::JSValue JSBufferList::_getBuffer(JSC::VM& vm, JSC::JSGlobalObject* lexicalG
return throwOutOfMemoryError(lexicalGlobalObject, throwScope);
}
auto buffer = array->possiblySharedBuffer();
JSC::JSUint8Array* newArray = JSC::JSUint8Array::create(lexicalGlobalObject, subclassStructure, buffer, n, len - n);
auto off = array->byteOffset();
JSC::JSUint8Array* newArray = JSC::JSUint8Array::create(lexicalGlobalObject, subclassStructure, buffer, off + n, len - n);
element.set(vm, this, newArray);
offset += n;
break;

11
test/js/node/stream/bufferlist.test.ts
View File

@@ -194,6 +194,17 @@ it("should work with .unshift()", () => {
expect(list.shift()).toBeUndefined();
});
it("should work with multiple partial .consume() from buffers", () => {
// @ts-ignore
const list = new Readable().readableBuffer;
expect(list.length).toBe(0);
expect(list.push(Buffer.from("f000baaa", "hex"))).toBeUndefined();
expect(list.length).toBe(1);
expect(list.consume(2, undefined)).toEqual(Buffer.from("f000", "hex"));
expect(list.consume(1, undefined)).toEqual(Buffer.from("ba", "hex"));
expect(list.length).toBe(1);
});
it("should work with partial .consume() followed by .first()", () => {
// @ts-ignore
const list = new Readable().readableBuffer;