Skip to content

stream: fix isDetachedBuffer validations in ReadableStream #44114

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

Merged
nodejs-github-bot merged 9 commits into from
Aug 18, 2022
Merged

stream: fix isDetachedBuffer validations in ReadableStream #44114

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
Prev Previous commit
Next Next commit
fixup: improve the checker 
Signed-off-by: Daeyeon Jeong daeyeon.dev@gmail.com
  • Loading branch information
@daeyeon
daeyeon committed Aug 6, 2022
commit 6fd3ea1945472e708e017d2a3b6e22cd5637f105
15 changes: 14 additions & 1 deletion lib/internal/webstreams/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ const {
} = internalBinding('buffer');

const {
isArrayBuffer,
isArrayBufferView,
isPromise,
} = require('internal/util/types');

Expand Down Expand Up @@ -130,17 +132,28 @@ function transferArrayBuffer(buffer) {
}

function isDetachedBuffer(buffer) {
if (!isArrayBuffer(buffer))
throw new ERR_INVALID_ARG_TYPE('buffer', 'ArrayBuffer', buffer);
if (ArrayBufferGetByteLength(buffer) === 0) {
Comment thread
LiviaMedeiros marked this conversation as resolved.
// TODO(daeyeon): Consider using C++ builtin to improve performance.
try {
new Uint8Array(buffer);
} catch {
} catch (error) {
assert(error.name === 'TypeError');
return true;
}
}
return false;
}

function isViewedArrayBufferDetached(view) {
if (!isArrayBufferView(view)) {
throw new ERR_INVALID_ARG_TYPE(
'view',
['Buffer', 'TypedArray', 'DataView'],
view,
);
}
return (
ArrayBufferViewGetByteLength(view) === 0 &&
isDetachedBuffer(ArrayBufferViewGetBuffer(view))
Expand Down