Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 22 additions & 18 deletions lib/internal/webstreams/readablestream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,9 +97,6 @@ const {
} = require('internal/streams/utils');

const {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -111,6 +108,7 @@ const {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
kState,
Expand DownExpand Up@@ -751,8 +749,9 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (ArrayBufferPrototypeGetDetached(viewBuffer)) {
Expand DownExpand Up@@ -1037,8 +1036,9 @@ class ReadableStreamBYOBReader {
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(viewBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -1255,8 +1255,9 @@ class ReadableByteStreamController {
if (!isReadableByteStreamController(this))
throw new ERR_INVALID_THIS('ReadableByteStreamController');
validateBuffer(chunk);
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const chunkBuffer = arrayBufferView[0];
const chunkByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(chunkBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -2858,9 +2859,10 @@ function readableByteStreamControllerPullInto(
assert(minimumFill >= elementSize && minimumFill <= view.byteLength);
assert(minimumFill % elementSize === 0);

const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
const arrayBufferView = getArrayBufferView(view);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);

let transferredBuffer;
Expand DownExpand Up@@ -3001,9 +3003,10 @@ function readableByteStreamControllerEnqueue(controller, chunk) {
stream,
} = controller[kState];

const buffer = ArrayBufferViewGetBuffer(chunk);
const byteOffset = ArrayBufferViewGetByteOffset(chunk);
const byteLength = ArrayBufferViewGetByteLength(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];

if (closeRequested || stream[kState].state !== 'readable')
return;
Expand DownExpand Up@@ -3296,9 +3299,10 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
const desc = pendingPullIntos[0];
assert(stream[kState].state !== 'errored');

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteOffset = arrayBufferView[1];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (stream[kState].state === 'closed') {
Expand Down
57 changes: 13 additions & 44 deletions lib/internal/webstreams/util.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
'use strict';

const {
ArrayBufferPrototypeGetByteLength,
ArrayBufferPrototypeGetDetached,
ArrayBufferPrototypeSlice,
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
Expand All@@ -13,9 +10,7 @@ const {
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
ReflectGet,
Symbol,
Uint8Array,
} = primordials;

const {
Expand All@@ -29,16 +24,19 @@ const {
} = internalBinding('buffer');

const {
inspect,
} = require('util');

const {
canCopyArrayBuffer,
cloneAsUint8Array,
constants: {
kPending,
},
getArrayBufferView,
getPromiseDetails,
} = internalBinding('util');

const {
inspect,
} = require('util');

const assert = require('internal/assert');

const {
Expand DownExpand Up@@ -93,38 +91,11 @@ function customInspect(depth, options, name, data) {
return `${name} ${inspect(data, opts)}`;
}

// These are defensive to work around the possibility that
// the buffer, byteLength, and byteOffset properties on
// ArrayBuffer and ArrayBufferView's may have been tampered with.

function ArrayBufferViewGetBuffer(view) {
return ReflectGet(view.constructor.prototype, 'buffer', view);
}

function ArrayBufferViewGetByteLength(view) {
return ReflectGet(view.constructor.prototype, 'byteLength', view);
}

function ArrayBufferViewGetByteOffset(view) {
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
}

function cloneAsUint8Array(view) {
const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
return new Uint8Array(
ArrayBufferPrototypeSlice(buffer, byteOffset, byteOffset + byteLength),
);
}

function canCopyArrayBuffer(toBuffer, toIndex, fromBuffer, fromIndex, count) {
return toBuffer !== fromBuffer &&
!ArrayBufferPrototypeGetDetached(toBuffer) &&
!ArrayBufferPrototypeGetDetached(fromBuffer) &&
toIndex + count <= ArrayBufferPrototypeGetByteLength(toBuffer) &&
fromIndex + count <= ArrayBufferPrototypeGetByteLength(fromBuffer);
}
// getArrayBufferView, canCopyArrayBuffer, and cloneAsUint8Array are
// implemented in src/node_util.cc via direct V8 API calls. They are immune to
// user tampering of typed-array prototypes (matching the defensive behavior of
// the previous Reflect.get-based JS implementation) and faster on hot
// byte-stream paths.

function isBrandCheck(brand) {
return (value) => {
Expand DownExpand Up@@ -248,9 +219,6 @@ function lazyTransfer() {
}

module.exports = {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -264,6 +232,7 @@ module.exports = {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
isPromisePending,
Expand Down
45 changes: 32 additions & 13 deletions src/node_buffer.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -1524,6 +1524,16 @@ static void SetDetachKey(const FunctionCallbackInfo<Value>& args) {

namespace {

bool ReadNonNegativeInteger(Local<Value> value, uint64_t* result) {
constexpr double kMaxSafeInteger = static_cast<double>((1LL << 53) - 1);
double number = value.As<Number>()->Value();
if (number < 0 || number > kMaxSafeInteger) {
return false;
}
*result = static_cast<uint64_t>(number);
return static_cast<double>(*result) == number;
}

std::pair<void*, size_t> DecomposeBufferToParts(Local<Value> buffer) {
void* pointer;
size_t byte_length;
Expand DownExpand Up@@ -1551,10 +1561,10 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
// args[4] == bytesToCopy

CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer());
CHECK(args[1]->IsUint32());
CHECK(args[1]->IsNumber());
CHECK(args[2]->IsArrayBuffer() || args[2]->IsSharedArrayBuffer());
CHECK(args[3]->IsUint32());
CHECK(args[4]->IsUint32());
CHECK(args[3]->IsNumber());
CHECK(args[4]->IsNumber());

void* destination;
size_t destination_byte_length;
Expand All@@ -1565,16 +1575,25 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
size_t source_byte_length;
std::tie(source, source_byte_length) = DecomposeBufferToParts(args[2]);

uint32_t destination_offset = args[1].As<Uint32>()->Value();
uint32_t source_offset = args[3].As<Uint32>()->Value();
size_t bytes_to_copy = args[4].As<Uint32>()->Value();

CHECK_GE(destination_byte_length - destination_offset, bytes_to_copy);
CHECK_GE(source_byte_length - source_offset, bytes_to_copy);

uint8_t* dest = static_cast<uint8_t*>(destination) + destination_offset;
uint8_t* src = static_cast<uint8_t*>(source) + source_offset;
memcpy(dest, src, bytes_to_copy);
uint64_t destination_offset;
uint64_t source_offset;
uint64_t bytes_to_copy;
CHECK(ReadNonNegativeInteger(args[1], &destination_offset));
CHECK(ReadNonNegativeInteger(args[3], &source_offset));
CHECK(ReadNonNegativeInteger(args[4], &bytes_to_copy));

CHECK_LE(destination_offset, static_cast<uint64_t>(destination_byte_length));
CHECK_LE(source_offset, static_cast<uint64_t>(source_byte_length));
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(destination_byte_length) - destination_offset);
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(source_byte_length) - source_offset);

uint8_t* dest = static_cast<uint8_t*>(destination) +
static_cast<size_t>(destination_offset);
uint8_t* src =
static_cast<uint8_t*>(source) + static_cast<size_t>(source_offset);
memcpy(dest, src, static_cast<size_t>(bytes_to_copy));
}

// Converts a number parameter to size_t suitable for ArrayBuffer sizes
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 22 additions & 18 deletions lib/internal/webstreams/readablestream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,9 +97,6 @@ const {
} = require('internal/streams/utils');

const {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -111,6 +108,7 @@ const {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
kState,
Expand DownExpand Up@@ -751,8 +749,9 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (ArrayBufferPrototypeGetDetached(viewBuffer)) {
Expand DownExpand Up@@ -1037,8 +1036,9 @@ class ReadableStreamBYOBReader {
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(viewBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -1255,8 +1255,9 @@ class ReadableByteStreamController {
if (!isReadableByteStreamController(this))
throw new ERR_INVALID_THIS('ReadableByteStreamController');
validateBuffer(chunk);
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const chunkBuffer = arrayBufferView[0];
const chunkByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(chunkBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -2858,9 +2859,10 @@ function readableByteStreamControllerPullInto(
assert(minimumFill >= elementSize && minimumFill <= view.byteLength);
assert(minimumFill % elementSize === 0);

const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
const arrayBufferView = getArrayBufferView(view);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);

let transferredBuffer;
Expand DownExpand Up@@ -3001,9 +3003,10 @@ function readableByteStreamControllerEnqueue(controller, chunk) {
stream,
} = controller[kState];

const buffer = ArrayBufferViewGetBuffer(chunk);
const byteOffset = ArrayBufferViewGetByteOffset(chunk);
const byteLength = ArrayBufferViewGetByteLength(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];

if (closeRequested || stream[kState].state !== 'readable')
return;
Expand DownExpand Up@@ -3296,9 +3299,10 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
const desc = pendingPullIntos[0];
assert(stream[kState].state !== 'errored');

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteOffset = arrayBufferView[1];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (stream[kState].state === 'closed') {
Expand Down
57 changes: 13 additions & 44 deletions lib/internal/webstreams/util.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
'use strict';

const {
ArrayBufferPrototypeGetByteLength,
ArrayBufferPrototypeGetDetached,
ArrayBufferPrototypeSlice,
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
Expand All@@ -13,9 +10,7 @@ const {
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
ReflectGet,
Symbol,
Uint8Array,
} = primordials;

const {
Expand All@@ -29,16 +24,19 @@ const {
} = internalBinding('buffer');

const {
inspect,
} = require('util');

const {
canCopyArrayBuffer,
cloneAsUint8Array,
constants: {
kPending,
},
getArrayBufferView,
getPromiseDetails,
} = internalBinding('util');

const {
inspect,
} = require('util');

const assert = require('internal/assert');

const {
Expand DownExpand Up@@ -93,38 +91,11 @@ function customInspect(depth, options, name, data) {
return `${name} ${inspect(data, opts)}`;
}

// These are defensive to work around the possibility that
// the buffer, byteLength, and byteOffset properties on
// ArrayBuffer and ArrayBufferView's may have been tampered with.

function ArrayBufferViewGetBuffer(view) {
return ReflectGet(view.constructor.prototype, 'buffer', view);
}

function ArrayBufferViewGetByteLength(view) {
return ReflectGet(view.constructor.prototype, 'byteLength', view);
}

function ArrayBufferViewGetByteOffset(view) {
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
}

function cloneAsUint8Array(view) {
const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
return new Uint8Array(
ArrayBufferPrototypeSlice(buffer, byteOffset, byteOffset + byteLength),
);
}

function canCopyArrayBuffer(toBuffer, toIndex, fromBuffer, fromIndex, count) {
return toBuffer !== fromBuffer &&
!ArrayBufferPrototypeGetDetached(toBuffer) &&
!ArrayBufferPrototypeGetDetached(fromBuffer) &&
toIndex + count <= ArrayBufferPrototypeGetByteLength(toBuffer) &&
fromIndex + count <= ArrayBufferPrototypeGetByteLength(fromBuffer);
}
// getArrayBufferView, canCopyArrayBuffer, and cloneAsUint8Array are
// implemented in src/node_util.cc via direct V8 API calls. They are immune to
// user tampering of typed-array prototypes (matching the defensive behavior of
// the previous Reflect.get-based JS implementation) and faster on hot
// byte-stream paths.

function isBrandCheck(brand) {
return (value) => {
Expand DownExpand Up@@ -248,9 +219,6 @@ function lazyTransfer() {
}

module.exports = {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -264,6 +232,7 @@ module.exports = {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
isPromisePending,
Expand Down
45 changes: 32 additions & 13 deletions src/node_buffer.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -1524,6 +1524,16 @@ static void SetDetachKey(const FunctionCallbackInfo<Value>& args) {

namespace {

bool ReadNonNegativeInteger(Local<Value> value, uint64_t* result) {
constexpr double kMaxSafeInteger = static_cast<double>((1LL << 53) - 1);
double number = value.As<Number>()->Value();
if (number < 0 || number > kMaxSafeInteger) {
return false;
}
*result = static_cast<uint64_t>(number);
return static_cast<double>(*result) == number;
}

std::pair<void*, size_t> DecomposeBufferToParts(Local<Value> buffer) {
void* pointer;
size_t byte_length;
Expand DownExpand Up@@ -1551,10 +1561,10 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
// args[4] == bytesToCopy

CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer());
CHECK(args[1]->IsUint32());
CHECK(args[1]->IsNumber());
CHECK(args[2]->IsArrayBuffer() || args[2]->IsSharedArrayBuffer());
CHECK(args[3]->IsUint32());
CHECK(args[4]->IsUint32());
CHECK(args[3]->IsNumber());
CHECK(args[4]->IsNumber());

void* destination;
size_t destination_byte_length;
Expand All@@ -1565,16 +1575,25 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
size_t source_byte_length;
std::tie(source, source_byte_length) = DecomposeBufferToParts(args[2]);

uint32_t destination_offset = args[1].As<Uint32>()->Value();
uint32_t source_offset = args[3].As<Uint32>()->Value();
size_t bytes_to_copy = args[4].As<Uint32>()->Value();

CHECK_GE(destination_byte_length - destination_offset, bytes_to_copy);
CHECK_GE(source_byte_length - source_offset, bytes_to_copy);

uint8_t* dest = static_cast<uint8_t*>(destination) + destination_offset;
uint8_t* src = static_cast<uint8_t*>(source) + source_offset;
memcpy(dest, src, bytes_to_copy);
uint64_t destination_offset;
uint64_t source_offset;
uint64_t bytes_to_copy;
CHECK(ReadNonNegativeInteger(args[1], &destination_offset));
CHECK(ReadNonNegativeInteger(args[3], &source_offset));
CHECK(ReadNonNegativeInteger(args[4], &bytes_to_copy));

CHECK_LE(destination_offset, static_cast<uint64_t>(destination_byte_length));
CHECK_LE(source_offset, static_cast<uint64_t>(source_byte_length));
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(destination_byte_length) - destination_offset);
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(source_byte_length) - source_offset);

uint8_t* dest = static_cast<uint8_t*>(destination) +
static_cast<size_t>(destination_offset);
uint8_t* src =
static_cast<uint8_t*>(source) + static_cast<size_t>(source_offset);
memcpy(dest, src, static_cast<size_t>(bytes_to_copy));
}

// Converts a number parameter to size_t suitable for ArrayBuffer sizes
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 22 additions & 18 deletions lib/internal/webstreams/readablestream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,9 +97,6 @@ const {
} = require('internal/streams/utils');

const {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -111,6 +108,7 @@ const {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
kState,
Expand DownExpand Up@@ -751,8 +749,9 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (ArrayBufferPrototypeGetDetached(viewBuffer)) {
Expand DownExpand Up@@ -1037,8 +1036,9 @@ class ReadableStreamBYOBReader {
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(viewBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -1255,8 +1255,9 @@ class ReadableByteStreamController {
if (!isReadableByteStreamController(this))
throw new ERR_INVALID_THIS('ReadableByteStreamController');
validateBuffer(chunk);
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const chunkBuffer = arrayBufferView[0];
const chunkByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(chunkBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -2858,9 +2859,10 @@ function readableByteStreamControllerPullInto(
assert(minimumFill >= elementSize && minimumFill <= view.byteLength);
assert(minimumFill % elementSize === 0);

const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
const arrayBufferView = getArrayBufferView(view);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);

let transferredBuffer;
Expand DownExpand Up@@ -3001,9 +3003,10 @@ function readableByteStreamControllerEnqueue(controller, chunk) {
stream,
} = controller[kState];

const buffer = ArrayBufferViewGetBuffer(chunk);
const byteOffset = ArrayBufferViewGetByteOffset(chunk);
const byteLength = ArrayBufferViewGetByteLength(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];

if (closeRequested || stream[kState].state !== 'readable')
return;
Expand DownExpand Up@@ -3296,9 +3299,10 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
const desc = pendingPullIntos[0];
assert(stream[kState].state !== 'errored');

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteOffset = arrayBufferView[1];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (stream[kState].state === 'closed') {
Expand Down
57 changes: 13 additions & 44 deletions lib/internal/webstreams/util.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
'use strict';

const {
ArrayBufferPrototypeGetByteLength,
ArrayBufferPrototypeGetDetached,
ArrayBufferPrototypeSlice,
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
Expand All@@ -13,9 +10,7 @@ const {
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
ReflectGet,
Symbol,
Uint8Array,
} = primordials;

const {
Expand All@@ -29,16 +24,19 @@ const {
} = internalBinding('buffer');

const {
inspect,
} = require('util');

const {
canCopyArrayBuffer,
cloneAsUint8Array,
constants: {
kPending,
},
getArrayBufferView,
getPromiseDetails,
} = internalBinding('util');

const {
inspect,
} = require('util');

const assert = require('internal/assert');

const {
Expand DownExpand Up@@ -93,38 +91,11 @@ function customInspect(depth, options, name, data) {
return `${name} ${inspect(data, opts)}`;
}

// These are defensive to work around the possibility that
// the buffer, byteLength, and byteOffset properties on
// ArrayBuffer and ArrayBufferView's may have been tampered with.

function ArrayBufferViewGetBuffer(view) {
return ReflectGet(view.constructor.prototype, 'buffer', view);
}

function ArrayBufferViewGetByteLength(view) {
return ReflectGet(view.constructor.prototype, 'byteLength', view);
}

function ArrayBufferViewGetByteOffset(view) {
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
}

function cloneAsUint8Array(view) {
const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
return new Uint8Array(
ArrayBufferPrototypeSlice(buffer, byteOffset, byteOffset + byteLength),
);
}

function canCopyArrayBuffer(toBuffer, toIndex, fromBuffer, fromIndex, count) {
return toBuffer !== fromBuffer &&
!ArrayBufferPrototypeGetDetached(toBuffer) &&
!ArrayBufferPrototypeGetDetached(fromBuffer) &&
toIndex + count <= ArrayBufferPrototypeGetByteLength(toBuffer) &&
fromIndex + count <= ArrayBufferPrototypeGetByteLength(fromBuffer);
}
// getArrayBufferView, canCopyArrayBuffer, and cloneAsUint8Array are
// implemented in src/node_util.cc via direct V8 API calls. They are immune to
// user tampering of typed-array prototypes (matching the defensive behavior of
// the previous Reflect.get-based JS implementation) and faster on hot
// byte-stream paths.

function isBrandCheck(brand) {
return (value) => {
Expand DownExpand Up@@ -248,9 +219,6 @@ function lazyTransfer() {
}

module.exports = {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -264,6 +232,7 @@ module.exports = {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
isPromisePending,
Expand Down
45 changes: 32 additions & 13 deletions src/node_buffer.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -1524,6 +1524,16 @@ static void SetDetachKey(const FunctionCallbackInfo<Value>& args) {

namespace {

bool ReadNonNegativeInteger(Local<Value> value, uint64_t* result) {
constexpr double kMaxSafeInteger = static_cast<double>((1LL << 53) - 1);
double number = value.As<Number>()->Value();
if (number < 0 || number > kMaxSafeInteger) {
return false;
}
*result = static_cast<uint64_t>(number);
return static_cast<double>(*result) == number;
}

std::pair<void*, size_t> DecomposeBufferToParts(Local<Value> buffer) {
void* pointer;
size_t byte_length;
Expand DownExpand Up@@ -1551,10 +1561,10 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
// args[4] == bytesToCopy

CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer());
CHECK(args[1]->IsUint32());
CHECK(args[1]->IsNumber());
CHECK(args[2]->IsArrayBuffer() || args[2]->IsSharedArrayBuffer());
CHECK(args[3]->IsUint32());
CHECK(args[4]->IsUint32());
CHECK(args[3]->IsNumber());
CHECK(args[4]->IsNumber());

void* destination;
size_t destination_byte_length;
Expand All@@ -1565,16 +1575,25 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
size_t source_byte_length;
std::tie(source, source_byte_length) = DecomposeBufferToParts(args[2]);

uint32_t destination_offset = args[1].As<Uint32>()->Value();
uint32_t source_offset = args[3].As<Uint32>()->Value();
size_t bytes_to_copy = args[4].As<Uint32>()->Value();

CHECK_GE(destination_byte_length - destination_offset, bytes_to_copy);
CHECK_GE(source_byte_length - source_offset, bytes_to_copy);

uint8_t* dest = static_cast<uint8_t*>(destination) + destination_offset;
uint8_t* src = static_cast<uint8_t*>(source) + source_offset;
memcpy(dest, src, bytes_to_copy);
uint64_t destination_offset;
uint64_t source_offset;
uint64_t bytes_to_copy;
CHECK(ReadNonNegativeInteger(args[1], &destination_offset));
CHECK(ReadNonNegativeInteger(args[3], &source_offset));
CHECK(ReadNonNegativeInteger(args[4], &bytes_to_copy));

CHECK_LE(destination_offset, static_cast<uint64_t>(destination_byte_length));
CHECK_LE(source_offset, static_cast<uint64_t>(source_byte_length));
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(destination_byte_length) - destination_offset);
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(source_byte_length) - source_offset);

uint8_t* dest = static_cast<uint8_t*>(destination) +
static_cast<size_t>(destination_offset);
uint8_t* src =
static_cast<uint8_t*>(source) + static_cast<size_t>(source_offset);
memcpy(dest, src, static_cast<size_t>(bytes_to_copy));
}

// Converts a number parameter to size_t suitable for ArrayBuffer sizes
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 22 additions & 18 deletions lib/internal/webstreams/readablestream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,9 +97,6 @@ const {
} = require('internal/streams/utils');

const {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -111,6 +108,7 @@ const {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
kState,
Expand DownExpand Up@@ -751,8 +749,9 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (ArrayBufferPrototypeGetDetached(viewBuffer)) {
Expand DownExpand Up@@ -1037,8 +1036,9 @@ class ReadableStreamBYOBReader {
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(viewBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -1255,8 +1255,9 @@ class ReadableByteStreamController {
if (!isReadableByteStreamController(this))
throw new ERR_INVALID_THIS('ReadableByteStreamController');
validateBuffer(chunk);
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const chunkBuffer = arrayBufferView[0];
const chunkByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(chunkBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -2858,9 +2859,10 @@ function readableByteStreamControllerPullInto(
assert(minimumFill >= elementSize && minimumFill <= view.byteLength);
assert(minimumFill % elementSize === 0);

const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
const arrayBufferView = getArrayBufferView(view);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);

let transferredBuffer;
Expand DownExpand Up@@ -3001,9 +3003,10 @@ function readableByteStreamControllerEnqueue(controller, chunk) {
stream,
} = controller[kState];

const buffer = ArrayBufferViewGetBuffer(chunk);
const byteOffset = ArrayBufferViewGetByteOffset(chunk);
const byteLength = ArrayBufferViewGetByteLength(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];

if (closeRequested || stream[kState].state !== 'readable')
return;
Expand DownExpand Up@@ -3296,9 +3299,10 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
const desc = pendingPullIntos[0];
assert(stream[kState].state !== 'errored');

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteOffset = arrayBufferView[1];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (stream[kState].state === 'closed') {
Expand Down
57 changes: 13 additions & 44 deletions lib/internal/webstreams/util.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
'use strict';

const {
ArrayBufferPrototypeGetByteLength,
ArrayBufferPrototypeGetDetached,
ArrayBufferPrototypeSlice,
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
Expand All@@ -13,9 +10,7 @@ const {
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
ReflectGet,
Symbol,
Uint8Array,
} = primordials;

const {
Expand All@@ -29,16 +24,19 @@ const {
} = internalBinding('buffer');

const {
inspect,
} = require('util');

const {
canCopyArrayBuffer,
cloneAsUint8Array,
constants: {
kPending,
},
getArrayBufferView,
getPromiseDetails,
} = internalBinding('util');

const {
inspect,
} = require('util');

const assert = require('internal/assert');

const {
Expand DownExpand Up@@ -93,38 +91,11 @@ function customInspect(depth, options, name, data) {
return `${name} ${inspect(data, opts)}`;
}

// These are defensive to work around the possibility that
// the buffer, byteLength, and byteOffset properties on
// ArrayBuffer and ArrayBufferView's may have been tampered with.

function ArrayBufferViewGetBuffer(view) {
return ReflectGet(view.constructor.prototype, 'buffer', view);
}

function ArrayBufferViewGetByteLength(view) {
return ReflectGet(view.constructor.prototype, 'byteLength', view);
}

function ArrayBufferViewGetByteOffset(view) {
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
}

function cloneAsUint8Array(view) {
const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
return new Uint8Array(
ArrayBufferPrototypeSlice(buffer, byteOffset, byteOffset + byteLength),
);
}

function canCopyArrayBuffer(toBuffer, toIndex, fromBuffer, fromIndex, count) {
return toBuffer !== fromBuffer &&
!ArrayBufferPrototypeGetDetached(toBuffer) &&
!ArrayBufferPrototypeGetDetached(fromBuffer) &&
toIndex + count <= ArrayBufferPrototypeGetByteLength(toBuffer) &&
fromIndex + count <= ArrayBufferPrototypeGetByteLength(fromBuffer);
}
// getArrayBufferView, canCopyArrayBuffer, and cloneAsUint8Array are
// implemented in src/node_util.cc via direct V8 API calls. They are immune to
// user tampering of typed-array prototypes (matching the defensive behavior of
// the previous Reflect.get-based JS implementation) and faster on hot
// byte-stream paths.

function isBrandCheck(brand) {
return (value) => {
Expand DownExpand Up@@ -248,9 +219,6 @@ function lazyTransfer() {
}

module.exports = {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -264,6 +232,7 @@ module.exports = {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
isPromisePending,
Expand Down
45 changes: 32 additions & 13 deletions src/node_buffer.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -1524,6 +1524,16 @@ static void SetDetachKey(const FunctionCallbackInfo<Value>& args) {

namespace {

bool ReadNonNegativeInteger(Local<Value> value, uint64_t* result) {
constexpr double kMaxSafeInteger = static_cast<double>((1LL << 53) - 1);
double number = value.As<Number>()->Value();
if (number < 0 || number > kMaxSafeInteger) {
return false;
}
*result = static_cast<uint64_t>(number);
return static_cast<double>(*result) == number;
}

std::pair<void*, size_t> DecomposeBufferToParts(Local<Value> buffer) {
void* pointer;
size_t byte_length;
Expand DownExpand Up@@ -1551,10 +1561,10 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
// args[4] == bytesToCopy

CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer());
CHECK(args[1]->IsUint32());
CHECK(args[1]->IsNumber());
CHECK(args[2]->IsArrayBuffer() || args[2]->IsSharedArrayBuffer());
CHECK(args[3]->IsUint32());
CHECK(args[4]->IsUint32());
CHECK(args[3]->IsNumber());
CHECK(args[4]->IsNumber());

void* destination;
size_t destination_byte_length;
Expand All@@ -1565,16 +1575,25 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
size_t source_byte_length;
std::tie(source, source_byte_length) = DecomposeBufferToParts(args[2]);

uint32_t destination_offset = args[1].As<Uint32>()->Value();
uint32_t source_offset = args[3].As<Uint32>()->Value();
size_t bytes_to_copy = args[4].As<Uint32>()->Value();

CHECK_GE(destination_byte_length - destination_offset, bytes_to_copy);
CHECK_GE(source_byte_length - source_offset, bytes_to_copy);

uint8_t* dest = static_cast<uint8_t*>(destination) + destination_offset;
uint8_t* src = static_cast<uint8_t*>(source) + source_offset;
memcpy(dest, src, bytes_to_copy);
uint64_t destination_offset;
uint64_t source_offset;
uint64_t bytes_to_copy;
CHECK(ReadNonNegativeInteger(args[1], &destination_offset));
CHECK(ReadNonNegativeInteger(args[3], &source_offset));
CHECK(ReadNonNegativeInteger(args[4], &bytes_to_copy));

CHECK_LE(destination_offset, static_cast<uint64_t>(destination_byte_length));
CHECK_LE(source_offset, static_cast<uint64_t>(source_byte_length));
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(destination_byte_length) - destination_offset);
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(source_byte_length) - source_offset);

uint8_t* dest = static_cast<uint8_t*>(destination) +
static_cast<size_t>(destination_offset);
uint8_t* src =
static_cast<uint8_t*>(source) + static_cast<size_t>(source_offset);
memcpy(dest, src, static_cast<size_t>(bytes_to_copy));
}

// Converts a number parameter to size_t suitable for ArrayBuffer sizes
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 22 additions & 18 deletions lib/internal/webstreams/readablestream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,9 +97,6 @@ const {
} = require('internal/streams/utils');

const {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -111,6 +108,7 @@ const {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
kState,
Expand DownExpand Up@@ -751,8 +749,9 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (ArrayBufferPrototypeGetDetached(viewBuffer)) {
Expand DownExpand Up@@ -1037,8 +1036,9 @@ class ReadableStreamBYOBReader {
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(viewBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -1255,8 +1255,9 @@ class ReadableByteStreamController {
if (!isReadableByteStreamController(this))
throw new ERR_INVALID_THIS('ReadableByteStreamController');
validateBuffer(chunk);
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const chunkBuffer = arrayBufferView[0];
const chunkByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(chunkBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -2858,9 +2859,10 @@ function readableByteStreamControllerPullInto(
assert(minimumFill >= elementSize && minimumFill <= view.byteLength);
assert(minimumFill % elementSize === 0);

const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
const arrayBufferView = getArrayBufferView(view);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);

let transferredBuffer;
Expand DownExpand Up@@ -3001,9 +3003,10 @@ function readableByteStreamControllerEnqueue(controller, chunk) {
stream,
} = controller[kState];

const buffer = ArrayBufferViewGetBuffer(chunk);
const byteOffset = ArrayBufferViewGetByteOffset(chunk);
const byteLength = ArrayBufferViewGetByteLength(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];

if (closeRequested || stream[kState].state !== 'readable')
return;
Expand DownExpand Up@@ -3296,9 +3299,10 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
const desc = pendingPullIntos[0];
assert(stream[kState].state !== 'errored');

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteOffset = arrayBufferView[1];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (stream[kState].state === 'closed') {
Expand Down
57 changes: 13 additions & 44 deletions lib/internal/webstreams/util.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
'use strict';

const {
ArrayBufferPrototypeGetByteLength,
ArrayBufferPrototypeGetDetached,
ArrayBufferPrototypeSlice,
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
Expand All@@ -13,9 +10,7 @@ const {
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
ReflectGet,
Symbol,
Uint8Array,
} = primordials;

const {
Expand All@@ -29,16 +24,19 @@ const {
} = internalBinding('buffer');

const {
inspect,
} = require('util');

const {
canCopyArrayBuffer,
cloneAsUint8Array,
constants: {
kPending,
},
getArrayBufferView,
getPromiseDetails,
} = internalBinding('util');

const {
inspect,
} = require('util');

const assert = require('internal/assert');

const {
Expand DownExpand Up@@ -93,38 +91,11 @@ function customInspect(depth, options, name, data) {
return `${name} ${inspect(data, opts)}`;
}

// These are defensive to work around the possibility that
// the buffer, byteLength, and byteOffset properties on
// ArrayBuffer and ArrayBufferView's may have been tampered with.

function ArrayBufferViewGetBuffer(view) {
return ReflectGet(view.constructor.prototype, 'buffer', view);
}

function ArrayBufferViewGetByteLength(view) {
return ReflectGet(view.constructor.prototype, 'byteLength', view);
}

function ArrayBufferViewGetByteOffset(view) {
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
}

function cloneAsUint8Array(view) {
const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
return new Uint8Array(
ArrayBufferPrototypeSlice(buffer, byteOffset, byteOffset + byteLength),
);
}

function canCopyArrayBuffer(toBuffer, toIndex, fromBuffer, fromIndex, count) {
return toBuffer !== fromBuffer &&
!ArrayBufferPrototypeGetDetached(toBuffer) &&
!ArrayBufferPrototypeGetDetached(fromBuffer) &&
toIndex + count <= ArrayBufferPrototypeGetByteLength(toBuffer) &&
fromIndex + count <= ArrayBufferPrototypeGetByteLength(fromBuffer);
}
// getArrayBufferView, canCopyArrayBuffer, and cloneAsUint8Array are
// implemented in src/node_util.cc via direct V8 API calls. They are immune to
// user tampering of typed-array prototypes (matching the defensive behavior of
// the previous Reflect.get-based JS implementation) and faster on hot
// byte-stream paths.

function isBrandCheck(brand) {
return (value) => {
Expand DownExpand Up@@ -248,9 +219,6 @@ function lazyTransfer() {
}

module.exports = {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -264,6 +232,7 @@ module.exports = {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
isPromisePending,
Expand Down
45 changes: 32 additions & 13 deletions src/node_buffer.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -1524,6 +1524,16 @@ static void SetDetachKey(const FunctionCallbackInfo<Value>& args) {

namespace {

bool ReadNonNegativeInteger(Local<Value> value, uint64_t* result) {
constexpr double kMaxSafeInteger = static_cast<double>((1LL << 53) - 1);
double number = value.As<Number>()->Value();
if (number < 0 || number > kMaxSafeInteger) {
return false;
}
*result = static_cast<uint64_t>(number);
return static_cast<double>(*result) == number;
}

std::pair<void*, size_t> DecomposeBufferToParts(Local<Value> buffer) {
void* pointer;
size_t byte_length;
Expand DownExpand Up@@ -1551,10 +1561,10 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
// args[4] == bytesToCopy

CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer());
CHECK(args[1]->IsUint32());
CHECK(args[1]->IsNumber());
CHECK(args[2]->IsArrayBuffer() || args[2]->IsSharedArrayBuffer());
CHECK(args[3]->IsUint32());
CHECK(args[4]->IsUint32());
CHECK(args[3]->IsNumber());
CHECK(args[4]->IsNumber());

void* destination;
size_t destination_byte_length;
Expand All@@ -1565,16 +1575,25 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
size_t source_byte_length;
std::tie(source, source_byte_length) = DecomposeBufferToParts(args[2]);

uint32_t destination_offset = args[1].As<Uint32>()->Value();
uint32_t source_offset = args[3].As<Uint32>()->Value();
size_t bytes_to_copy = args[4].As<Uint32>()->Value();

CHECK_GE(destination_byte_length - destination_offset, bytes_to_copy);
CHECK_GE(source_byte_length - source_offset, bytes_to_copy);

uint8_t* dest = static_cast<uint8_t*>(destination) + destination_offset;
uint8_t* src = static_cast<uint8_t*>(source) + source_offset;
memcpy(dest, src, bytes_to_copy);
uint64_t destination_offset;
uint64_t source_offset;
uint64_t bytes_to_copy;
CHECK(ReadNonNegativeInteger(args[1], &destination_offset));
CHECK(ReadNonNegativeInteger(args[3], &source_offset));
CHECK(ReadNonNegativeInteger(args[4], &bytes_to_copy));

CHECK_LE(destination_offset, static_cast<uint64_t>(destination_byte_length));
CHECK_LE(source_offset, static_cast<uint64_t>(source_byte_length));
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(destination_byte_length) - destination_offset);
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(source_byte_length) - source_offset);

uint8_t* dest = static_cast<uint8_t*>(destination) +
static_cast<size_t>(destination_offset);
uint8_t* src =
static_cast<uint8_t*>(source) + static_cast<size_t>(source_offset);
memcpy(dest, src, static_cast<size_t>(bytes_to_copy));
}

// Converts a number parameter to size_t suitable for ArrayBuffer sizes
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 22 additions & 18 deletions lib/internal/webstreams/readablestream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,9 +97,6 @@ const {
} = require('internal/streams/utils');

const {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -111,6 +108,7 @@ const {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
kState,
Expand DownExpand Up@@ -751,8 +749,9 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (ArrayBufferPrototypeGetDetached(viewBuffer)) {
Expand DownExpand Up@@ -1037,8 +1036,9 @@ class ReadableStreamBYOBReader {
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(viewBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -1255,8 +1255,9 @@ class ReadableByteStreamController {
if (!isReadableByteStreamController(this))
throw new ERR_INVALID_THIS('ReadableByteStreamController');
validateBuffer(chunk);
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const chunkBuffer = arrayBufferView[0];
const chunkByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(chunkBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -2858,9 +2859,10 @@ function readableByteStreamControllerPullInto(
assert(minimumFill >= elementSize && minimumFill <= view.byteLength);
assert(minimumFill % elementSize === 0);

const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
const arrayBufferView = getArrayBufferView(view);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);

let transferredBuffer;
Expand DownExpand Up@@ -3001,9 +3003,10 @@ function readableByteStreamControllerEnqueue(controller, chunk) {
stream,
} = controller[kState];

const buffer = ArrayBufferViewGetBuffer(chunk);
const byteOffset = ArrayBufferViewGetByteOffset(chunk);
const byteLength = ArrayBufferViewGetByteLength(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];

if (closeRequested || stream[kState].state !== 'readable')
return;
Expand DownExpand Up@@ -3296,9 +3299,10 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
const desc = pendingPullIntos[0];
assert(stream[kState].state !== 'errored');

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteOffset = arrayBufferView[1];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (stream[kState].state === 'closed') {
Expand Down
57 changes: 13 additions & 44 deletions lib/internal/webstreams/util.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
'use strict';

const {
ArrayBufferPrototypeGetByteLength,
ArrayBufferPrototypeGetDetached,
ArrayBufferPrototypeSlice,
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
Expand All@@ -13,9 +10,7 @@ const {
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
ReflectGet,
Symbol,
Uint8Array,
} = primordials;

const {
Expand All@@ -29,16 +24,19 @@ const {
} = internalBinding('buffer');

const {
inspect,
} = require('util');

const {
canCopyArrayBuffer,
cloneAsUint8Array,
constants: {
kPending,
},
getArrayBufferView,
getPromiseDetails,
} = internalBinding('util');

const {
inspect,
} = require('util');

const assert = require('internal/assert');

const {
Expand DownExpand Up@@ -93,38 +91,11 @@ function customInspect(depth, options, name, data) {
return `${name} ${inspect(data, opts)}`;
}

// These are defensive to work around the possibility that
// the buffer, byteLength, and byteOffset properties on
// ArrayBuffer and ArrayBufferView's may have been tampered with.

function ArrayBufferViewGetBuffer(view) {
return ReflectGet(view.constructor.prototype, 'buffer', view);
}

function ArrayBufferViewGetByteLength(view) {
return ReflectGet(view.constructor.prototype, 'byteLength', view);
}

function ArrayBufferViewGetByteOffset(view) {
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
}

function cloneAsUint8Array(view) {
const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
return new Uint8Array(
ArrayBufferPrototypeSlice(buffer, byteOffset, byteOffset + byteLength),
);
}

function canCopyArrayBuffer(toBuffer, toIndex, fromBuffer, fromIndex, count) {
return toBuffer !== fromBuffer &&
!ArrayBufferPrototypeGetDetached(toBuffer) &&
!ArrayBufferPrototypeGetDetached(fromBuffer) &&
toIndex + count <= ArrayBufferPrototypeGetByteLength(toBuffer) &&
fromIndex + count <= ArrayBufferPrototypeGetByteLength(fromBuffer);
}
// getArrayBufferView, canCopyArrayBuffer, and cloneAsUint8Array are
// implemented in src/node_util.cc via direct V8 API calls. They are immune to
// user tampering of typed-array prototypes (matching the defensive behavior of
// the previous Reflect.get-based JS implementation) and faster on hot
// byte-stream paths.

function isBrandCheck(brand) {
return (value) => {
Expand DownExpand Up@@ -248,9 +219,6 @@ function lazyTransfer() {
}

module.exports = {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -264,6 +232,7 @@ module.exports = {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
isPromisePending,
Expand Down
45 changes: 32 additions & 13 deletions src/node_buffer.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -1524,6 +1524,16 @@ static void SetDetachKey(const FunctionCallbackInfo<Value>& args) {

namespace {

bool ReadNonNegativeInteger(Local<Value> value, uint64_t* result) {
constexpr double kMaxSafeInteger = static_cast<double>((1LL << 53) - 1);
double number = value.As<Number>()->Value();
if (number < 0 || number > kMaxSafeInteger) {
return false;
}
*result = static_cast<uint64_t>(number);
return static_cast<double>(*result) == number;
}

std::pair<void*, size_t> DecomposeBufferToParts(Local<Value> buffer) {
void* pointer;
size_t byte_length;
Expand DownExpand Up@@ -1551,10 +1561,10 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
// args[4] == bytesToCopy

CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer());
CHECK(args[1]->IsUint32());
CHECK(args[1]->IsNumber());
CHECK(args[2]->IsArrayBuffer() || args[2]->IsSharedArrayBuffer());
CHECK(args[3]->IsUint32());
CHECK(args[4]->IsUint32());
CHECK(args[3]->IsNumber());
CHECK(args[4]->IsNumber());

void* destination;
size_t destination_byte_length;
Expand All@@ -1565,16 +1575,25 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
size_t source_byte_length;
std::tie(source, source_byte_length) = DecomposeBufferToParts(args[2]);

uint32_t destination_offset = args[1].As<Uint32>()->Value();
uint32_t source_offset = args[3].As<Uint32>()->Value();
size_t bytes_to_copy = args[4].As<Uint32>()->Value();

CHECK_GE(destination_byte_length - destination_offset, bytes_to_copy);
CHECK_GE(source_byte_length - source_offset, bytes_to_copy);

uint8_t* dest = static_cast<uint8_t*>(destination) + destination_offset;
uint8_t* src = static_cast<uint8_t*>(source) + source_offset;
memcpy(dest, src, bytes_to_copy);
uint64_t destination_offset;
uint64_t source_offset;
uint64_t bytes_to_copy;
CHECK(ReadNonNegativeInteger(args[1], &destination_offset));
CHECK(ReadNonNegativeInteger(args[3], &source_offset));
CHECK(ReadNonNegativeInteger(args[4], &bytes_to_copy));

CHECK_LE(destination_offset, static_cast<uint64_t>(destination_byte_length));
CHECK_LE(source_offset, static_cast<uint64_t>(source_byte_length));
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(destination_byte_length) - destination_offset);
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(source_byte_length) - source_offset);

uint8_t* dest = static_cast<uint8_t*>(destination) +
static_cast<size_t>(destination_offset);
uint8_t* src =
static_cast<uint8_t*>(source) + static_cast<size_t>(source_offset);
memcpy(dest, src, static_cast<size_t>(bytes_to_copy));
}

// Converts a number parameter to size_t suitable for ArrayBuffer sizes
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 22 additions & 18 deletions lib/internal/webstreams/readablestream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,9 +97,6 @@ const {
} = require('internal/streams/utils');

const {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -111,6 +108,7 @@ const {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
kState,
Expand DownExpand Up@@ -751,8 +749,9 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (ArrayBufferPrototypeGetDetached(viewBuffer)) {
Expand DownExpand Up@@ -1037,8 +1036,9 @@ class ReadableStreamBYOBReader {
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(viewBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -1255,8 +1255,9 @@ class ReadableByteStreamController {
if (!isReadableByteStreamController(this))
throw new ERR_INVALID_THIS('ReadableByteStreamController');
validateBuffer(chunk);
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const chunkBuffer = arrayBufferView[0];
const chunkByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(chunkBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -2858,9 +2859,10 @@ function readableByteStreamControllerPullInto(
assert(minimumFill >= elementSize && minimumFill <= view.byteLength);
assert(minimumFill % elementSize === 0);

const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
const arrayBufferView = getArrayBufferView(view);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);

let transferredBuffer;
Expand DownExpand Up@@ -3001,9 +3003,10 @@ function readableByteStreamControllerEnqueue(controller, chunk) {
stream,
} = controller[kState];

const buffer = ArrayBufferViewGetBuffer(chunk);
const byteOffset = ArrayBufferViewGetByteOffset(chunk);
const byteLength = ArrayBufferViewGetByteLength(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];

if (closeRequested || stream[kState].state !== 'readable')
return;
Expand DownExpand Up@@ -3296,9 +3299,10 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
const desc = pendingPullIntos[0];
assert(stream[kState].state !== 'errored');

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteOffset = arrayBufferView[1];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (stream[kState].state === 'closed') {
Expand Down
57 changes: 13 additions & 44 deletions lib/internal/webstreams/util.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
'use strict';

const {
ArrayBufferPrototypeGetByteLength,
ArrayBufferPrototypeGetDetached,
ArrayBufferPrototypeSlice,
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
Expand All@@ -13,9 +10,7 @@ const {
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
ReflectGet,
Symbol,
Uint8Array,
} = primordials;

const {
Expand All@@ -29,16 +24,19 @@ const {
} = internalBinding('buffer');

const {
inspect,
} = require('util');

const {
canCopyArrayBuffer,
cloneAsUint8Array,
constants: {
kPending,
},
getArrayBufferView,
getPromiseDetails,
} = internalBinding('util');

const {
inspect,
} = require('util');

const assert = require('internal/assert');

const {
Expand DownExpand Up@@ -93,38 +91,11 @@ function customInspect(depth, options, name, data) {
return `${name} ${inspect(data, opts)}`;
}

// These are defensive to work around the possibility that
// the buffer, byteLength, and byteOffset properties on
// ArrayBuffer and ArrayBufferView's may have been tampered with.

function ArrayBufferViewGetBuffer(view) {
return ReflectGet(view.constructor.prototype, 'buffer', view);
}

function ArrayBufferViewGetByteLength(view) {
return ReflectGet(view.constructor.prototype, 'byteLength', view);
}

function ArrayBufferViewGetByteOffset(view) {
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
}

function cloneAsUint8Array(view) {
const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
return new Uint8Array(
ArrayBufferPrototypeSlice(buffer, byteOffset, byteOffset + byteLength),
);
}

function canCopyArrayBuffer(toBuffer, toIndex, fromBuffer, fromIndex, count) {
return toBuffer !== fromBuffer &&
!ArrayBufferPrototypeGetDetached(toBuffer) &&
!ArrayBufferPrototypeGetDetached(fromBuffer) &&
toIndex + count <= ArrayBufferPrototypeGetByteLength(toBuffer) &&
fromIndex + count <= ArrayBufferPrototypeGetByteLength(fromBuffer);
}
// getArrayBufferView, canCopyArrayBuffer, and cloneAsUint8Array are
// implemented in src/node_util.cc via direct V8 API calls. They are immune to
// user tampering of typed-array prototypes (matching the defensive behavior of
// the previous Reflect.get-based JS implementation) and faster on hot
// byte-stream paths.

function isBrandCheck(brand) {
return (value) => {
Expand DownExpand Up@@ -248,9 +219,6 @@ function lazyTransfer() {
}

module.exports = {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -264,6 +232,7 @@ module.exports = {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
isPromisePending,
Expand Down
45 changes: 32 additions & 13 deletions src/node_buffer.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -1524,6 +1524,16 @@ static void SetDetachKey(const FunctionCallbackInfo<Value>& args) {

namespace {

bool ReadNonNegativeInteger(Local<Value> value, uint64_t* result) {
constexpr double kMaxSafeInteger = static_cast<double>((1LL << 53) - 1);
double number = value.As<Number>()->Value();
if (number < 0 || number > kMaxSafeInteger) {
return false;
}
*result = static_cast<uint64_t>(number);
return static_cast<double>(*result) == number;
}

std::pair<void*, size_t> DecomposeBufferToParts(Local<Value> buffer) {
void* pointer;
size_t byte_length;
Expand DownExpand Up@@ -1551,10 +1561,10 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
// args[4] == bytesToCopy

CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer());
CHECK(args[1]->IsUint32());
CHECK(args[1]->IsNumber());
CHECK(args[2]->IsArrayBuffer() || args[2]->IsSharedArrayBuffer());
CHECK(args[3]->IsUint32());
CHECK(args[4]->IsUint32());
CHECK(args[3]->IsNumber());
CHECK(args[4]->IsNumber());

void* destination;
size_t destination_byte_length;
Expand All@@ -1565,16 +1575,25 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
size_t source_byte_length;
std::tie(source, source_byte_length) = DecomposeBufferToParts(args[2]);

uint32_t destination_offset = args[1].As<Uint32>()->Value();
uint32_t source_offset = args[3].As<Uint32>()->Value();
size_t bytes_to_copy = args[4].As<Uint32>()->Value();

CHECK_GE(destination_byte_length - destination_offset, bytes_to_copy);
CHECK_GE(source_byte_length - source_offset, bytes_to_copy);

uint8_t* dest = static_cast<uint8_t*>(destination) + destination_offset;
uint8_t* src = static_cast<uint8_t*>(source) + source_offset;
memcpy(dest, src, bytes_to_copy);
uint64_t destination_offset;
uint64_t source_offset;
uint64_t bytes_to_copy;
CHECK(ReadNonNegativeInteger(args[1], &destination_offset));
CHECK(ReadNonNegativeInteger(args[3], &source_offset));
CHECK(ReadNonNegativeInteger(args[4], &bytes_to_copy));

CHECK_LE(destination_offset, static_cast<uint64_t>(destination_byte_length));
CHECK_LE(source_offset, static_cast<uint64_t>(source_byte_length));
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(destination_byte_length) - destination_offset);
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(source_byte_length) - source_offset);

uint8_t* dest = static_cast<uint8_t*>(destination) +
static_cast<size_t>(destination_offset);
uint8_t* src =
static_cast<uint8_t*>(source) + static_cast<size_t>(source_offset);
memcpy(dest, src, static_cast<size_t>(bytes_to_copy));
}

// Converts a number parameter to size_t suitable for ArrayBuffer sizes
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 22 additions & 18 deletions lib/internal/webstreams/readablestream.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,9 +97,6 @@ const {
} = require('internal/streams/utils');

const {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -111,6 +108,7 @@ const {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
kState,
Expand DownExpand Up@@ -751,8 +749,9 @@ class ReadableStreamBYOBRequest {
'This BYOB request has been invalidated');
}

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (ArrayBufferPrototypeGetDetached(viewBuffer)) {
Expand DownExpand Up@@ -1037,8 +1036,9 @@ class ReadableStreamBYOBReader {
}
validateObject(options, 'options', kValidateObjectAllowObjectsAndNull);

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(viewBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -1255,8 +1255,9 @@ class ReadableByteStreamController {
if (!isReadableByteStreamController(this))
throw new ERR_INVALID_THIS('ReadableByteStreamController');
validateBuffer(chunk);
const chunkByteLength = ArrayBufferViewGetByteLength(chunk);
const chunkBuffer = ArrayBufferViewGetBuffer(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const chunkBuffer = arrayBufferView[0];
const chunkByteLength = arrayBufferView[2];

if (isSharedArrayBuffer(chunkBuffer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand DownExpand Up@@ -2858,9 +2859,10 @@ function readableByteStreamControllerPullInto(
assert(minimumFill >= elementSize && minimumFill <= view.byteLength);
assert(minimumFill % elementSize === 0);

const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
const arrayBufferView = getArrayBufferView(view);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];
const bufferByteLength = ArrayBufferPrototypeGetByteLength(buffer);

let transferredBuffer;
Expand DownExpand Up@@ -3001,9 +3003,10 @@ function readableByteStreamControllerEnqueue(controller, chunk) {
stream,
} = controller[kState];

const buffer = ArrayBufferViewGetBuffer(chunk);
const byteOffset = ArrayBufferViewGetByteOffset(chunk);
const byteLength = ArrayBufferViewGetByteLength(chunk);
const arrayBufferView = getArrayBufferView(chunk);
const buffer = arrayBufferView[0];
const byteOffset = arrayBufferView[1];
const byteLength = arrayBufferView[2];

if (closeRequested || stream[kState].state !== 'readable')
return;
Expand DownExpand Up@@ -3296,9 +3299,10 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
const desc = pendingPullIntos[0];
assert(stream[kState].state !== 'errored');

const viewByteLength = ArrayBufferViewGetByteLength(view);
const viewByteOffset = ArrayBufferViewGetByteOffset(view);
const viewBuffer = ArrayBufferViewGetBuffer(view);
const arrayBufferView = getArrayBufferView(view);
const viewBuffer = arrayBufferView[0];
const viewByteOffset = arrayBufferView[1];
const viewByteLength = arrayBufferView[2];
const viewBufferByteLength = ArrayBufferPrototypeGetByteLength(viewBuffer);

if (stream[kState].state === 'closed') {
Expand Down
57 changes: 13 additions & 44 deletions lib/internal/webstreams/util.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
'use strict';

const {
ArrayBufferPrototypeGetByteLength,
ArrayBufferPrototypeGetDetached,
ArrayBufferPrototypeSlice,
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
Expand All@@ -13,9 +10,7 @@ const {
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
ReflectGet,
Symbol,
Uint8Array,
} = primordials;

const {
Expand All@@ -29,16 +24,19 @@ const {
} = internalBinding('buffer');

const {
inspect,
} = require('util');

const {
canCopyArrayBuffer,
cloneAsUint8Array,
constants: {
kPending,
},
getArrayBufferView,
getPromiseDetails,
} = internalBinding('util');

const {
inspect,
} = require('util');

const assert = require('internal/assert');

const {
Expand DownExpand Up@@ -93,38 +91,11 @@ function customInspect(depth, options, name, data) {
return `${name} ${inspect(data, opts)}`;
}

// These are defensive to work around the possibility that
// the buffer, byteLength, and byteOffset properties on
// ArrayBuffer and ArrayBufferView's may have been tampered with.

function ArrayBufferViewGetBuffer(view) {
return ReflectGet(view.constructor.prototype, 'buffer', view);
}

function ArrayBufferViewGetByteLength(view) {
return ReflectGet(view.constructor.prototype, 'byteLength', view);
}

function ArrayBufferViewGetByteOffset(view) {
return ReflectGet(view.constructor.prototype, 'byteOffset', view);
}

function cloneAsUint8Array(view) {
const buffer = ArrayBufferViewGetBuffer(view);
const byteOffset = ArrayBufferViewGetByteOffset(view);
const byteLength = ArrayBufferViewGetByteLength(view);
return new Uint8Array(
ArrayBufferPrototypeSlice(buffer, byteOffset, byteOffset + byteLength),
);
}

function canCopyArrayBuffer(toBuffer, toIndex, fromBuffer, fromIndex, count) {
return toBuffer !== fromBuffer &&
!ArrayBufferPrototypeGetDetached(toBuffer) &&
!ArrayBufferPrototypeGetDetached(fromBuffer) &&
toIndex + count <= ArrayBufferPrototypeGetByteLength(toBuffer) &&
fromIndex + count <= ArrayBufferPrototypeGetByteLength(fromBuffer);
}
// getArrayBufferView, canCopyArrayBuffer, and cloneAsUint8Array are
// implemented in src/node_util.cc via direct V8 API calls. They are immune to
// user tampering of typed-array prototypes (matching the defensive behavior of
// the previous Reflect.get-based JS implementation) and faster on hot
// byte-stream paths.

function isBrandCheck(brand) {
return (value) => {
Expand DownExpand Up@@ -248,9 +219,6 @@ function lazyTransfer() {
}

module.exports = {
ArrayBufferViewGetBuffer,
ArrayBufferViewGetByteLength,
ArrayBufferViewGetByteOffset,
AsyncIterator,
canCopyArrayBuffer,
cloneAsUint8Array,
Expand All@@ -264,6 +232,7 @@ module.exports = {
enqueueValueWithSize,
extractHighWaterMark,
extractSizeAlgorithm,
getArrayBufferView,
getNonWritablePropertyDescriptor,
isBrandCheck,
isPromisePending,
Expand Down
45 changes: 32 additions & 13 deletions src/node_buffer.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -1524,6 +1524,16 @@ static void SetDetachKey(const FunctionCallbackInfo<Value>& args) {

namespace {

bool ReadNonNegativeInteger(Local<Value> value, uint64_t* result) {
constexpr double kMaxSafeInteger = static_cast<double>((1LL << 53) - 1);
double number = value.As<Number>()->Value();
if (number < 0 || number > kMaxSafeInteger) {
return false;
}
*result = static_cast<uint64_t>(number);
return static_cast<double>(*result) == number;
}

std::pair<void*, size_t> DecomposeBufferToParts(Local<Value> buffer) {
void* pointer;
size_t byte_length;
Expand DownExpand Up@@ -1551,10 +1561,10 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
// args[4] == bytesToCopy

CHECK(args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer());
CHECK(args[1]->IsUint32());
CHECK(args[1]->IsNumber());
CHECK(args[2]->IsArrayBuffer() || args[2]->IsSharedArrayBuffer());
CHECK(args[3]->IsUint32());
CHECK(args[4]->IsUint32());
CHECK(args[3]->IsNumber());
CHECK(args[4]->IsNumber());

void* destination;
size_t destination_byte_length;
Expand All@@ -1565,16 +1575,25 @@ void CopyArrayBuffer(const FunctionCallbackInfo<Value>& args) {
size_t source_byte_length;
std::tie(source, source_byte_length) = DecomposeBufferToParts(args[2]);

uint32_t destination_offset = args[1].As<Uint32>()->Value();
uint32_t source_offset = args[3].As<Uint32>()->Value();
size_t bytes_to_copy = args[4].As<Uint32>()->Value();

CHECK_GE(destination_byte_length - destination_offset, bytes_to_copy);
CHECK_GE(source_byte_length - source_offset, bytes_to_copy);

uint8_t* dest = static_cast<uint8_t*>(destination) + destination_offset;
uint8_t* src = static_cast<uint8_t*>(source) + source_offset;
memcpy(dest, src, bytes_to_copy);
uint64_t destination_offset;
uint64_t source_offset;
uint64_t bytes_to_copy;
CHECK(ReadNonNegativeInteger(args[1], &destination_offset));
CHECK(ReadNonNegativeInteger(args[3], &source_offset));
CHECK(ReadNonNegativeInteger(args[4], &bytes_to_copy));

CHECK_LE(destination_offset, static_cast<uint64_t>(destination_byte_length));
CHECK_LE(source_offset, static_cast<uint64_t>(source_byte_length));
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(destination_byte_length) - destination_offset);
CHECK_LE(bytes_to_copy,
static_cast<uint64_t>(source_byte_length) - source_offset);

uint8_t* dest = static_cast<uint8_t*>(destination) +
static_cast<size_t>(destination_offset);
uint8_t* src =
static_cast<uint8_t*>(source) + static_cast<size_t>(source_offset);
memcpy(dest, src, static_cast<size_t>(bytes_to_copy));
}

// Converts a number parameter to size_t suitable for ArrayBuffer sizes
Expand Down
Loading
Loading