Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

stream: fix isDetachedBuffer validations in ReadableStream #44114

Merged
merged 9 commits into from
Aug 18, 2022
Merged

stream: fix isDetachedBuffer validations in ReadableStream #44114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e5e32c0
stream: fix `isDetachedBuffer` validations
daeyeon Aug 3, 2022
50c7728
fixup: check zero and add asserts
daeyeon Aug 4, 2022
6f6ba3e
fixup: use isDetachedBuffer only
daeyeon Aug 4, 2022
782c71a
revert "fixup: use isDetachedBuffer only"
daeyeon Aug 4, 2022
e44effa
fixup: remove redundant isDetachedBuffer
daeyeon Aug 6, 2022
6fd3ea1
fixup: improve the checker
daeyeon Aug 6, 2022
0cc34f4
fixup: change error message properly
daeyeon Aug 7, 2022
fe816cd
fixup: use assert for isDetachedBuffer
daeyeon Aug 7, 2022
58da0d8
fixup: apply suggestions
daeyeon Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 8 additions & 18 deletions lib/internal/webstreams/readablestream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ const {
extractHighWaterMark,
extractSizeAlgorithm,
lazyTransfer,
isDetachedBuffer,
isViewedArrayBufferDetached,
isBrandCheck,
resetQueue,
Expand Down Expand Up @@ -654,13 +655,8 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const viewBufferByteLength = ArrayBufferGetByteLength(viewBuffer);

if (viewByteLength === 0 || viewBufferByteLength === 0) {
throw new ERR_INVALID_STATE.TypeError(
'View ArrayBuffer is zero-length or detached');
if (isViewedArrayBufferDetached(view)) {
throw new ERR_INVALID_STATE.TypeError('Viewed ArrayBuffer is detached');
LiviaMedeiros marked this conversation as resolved.
Show resolved Hide resolved
}

readableByteStreamControllerRespond(controller, bytesWritten);
Expand Down Expand Up @@ -894,14 +890,9 @@ class ReadableStreamBYOBReader {
],
view));
}
const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const viewBufferByteLength = ArrayBufferGetByteLength(viewBuffer);

if (viewByteLength === 0 || viewBufferByteLength === 0) {
return PromiseReject(
new ERR_INVALID_STATE.TypeError(
'View ArrayBuffer is zero-length or detached'));
if (isViewedArrayBufferDetached(view)) {
throw new ERR_INVALID_STATE.TypeError('Viewed ArrayBuffer is detached');
LiviaMedeiros marked this conversation as resolved.
Show resolved Hide resolved
}
// Supposed to assert here that the view's buffer is not
// detached, but there's no API available to use to check that.
Expand Down Expand Up @@ -2298,11 +2289,10 @@ function readableByteStreamControllerEnqueue(
if (pendingPullIntos.length) {
const firstPendingPullInto = pendingPullIntos[0];

const pendingBufferByteLength =
ArrayBufferGetByteLength(firstPendingPullInto.buffer);
if (pendingBufferByteLength === 0) {
if (isDetachedBuffer(firstPendingPullInto.buffer)) {
throw new ERR_INVALID_STATE.TypeError(
'Destination ArrayBuffer is zero-length or detached');
'Destination ArrayBuffer is detached',
);
}

firstPendingPullInto.buffer =
Expand Down
5 changes: 3 additions & 2 deletions lib/internal/webstreams/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function transferArrayBuffer(buffer) {
return res;
}

function isArrayBufferDetached(buffer) {
function isDetachedBuffer(buffer) {
if (ArrayBufferGetByteLength(buffer) === 0) {
LiviaMedeiros marked this conversation as resolved.
Show resolved Hide resolved
try {
new Uint8Array(buffer);
Expand All @@ -143,7 +143,7 @@ function isArrayBufferDetached(buffer) {
function isViewedArrayBufferDetached(view) {
return (
ArrayBufferViewGetByteLength(view) === 0 &&
isArrayBufferDetached(ArrayBufferViewGetBuffer(view))
isDetachedBuffer(ArrayBufferViewGetBuffer(view))
);
}

Expand Down Expand Up @@ -243,6 +243,7 @@ module.exports = {
extractSizeAlgorithm,
lazyTransfer,
isBrandCheck,
isDetachedBuffer,
isPromisePending,
isViewedArrayBufferDetached,
peekQueueValue,
Expand Down