Commit bc6b630

Browse files
Archkonaduh95
authored andcommitted
buffer: treat detached ArrayBuffers as empty
Treat detached ArrayBuffers and Buffer or TypedArray views backed by them as zero-length inputs in buffer.isUtf8() and buffer.isAscii(). Both functions now return true for these inputs, consistent with other empty inputs. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64504Fixes: #64503 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6deeef1 commit bc6b630

4 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎doc/api/buffer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,6 +5317,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa
53175317
added:
53185318
- v19.6.0
53195319
- v18.15.0
5320+
changes:
5321+
- version: REPLACEME
5322+
pr-url: https://github.com/nodejs/node/pull/64504
5323+
description: Detached `ArrayBuffer`s and views backed by them are treated
5324+
as empty.
53205325
-->
53215326

53225327
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5325,14 +5330,19 @@ added:
53255330
This function returns `true` if `input` contains only valid ASCII-encoded data,
53265331
including the case in which `input` is empty.
53275332

5328-
Throws if the `input` is a detached array buffer.
5333+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53295334

53305335
### `buffer.isUtf8(input)`
53315336

53325337
<!-- YAML
53335338
added:
53345339
- v19.4.0
53355340
- v18.14.0
5341+
changes:
5342+
- version: REPLACEME
5343+
pr-url: https://github.com/nodejs/node/pull/64504
5344+
description: Detached `ArrayBuffer`s and views backed by them are treated
5345+
as empty.
53365346
-->
53375347

53385348
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5341,7 +5351,7 @@ added:
53415351
This function returns `true` if `input` contains only valid UTF-8-encoded data,
53425352
including the case in which `input` is empty.
53435353

5344-
Throws if the `input` is a detached array buffer.
5354+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53455355

53465356
### `buffer.INSPECT_MAX_BYTES`
53475357

‎src/node_buffer.cc‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,31 +1360,17 @@ void FastSwap64(Local<Value> receiver,
13601360

13611361
static CFunction fast_swap64(CFunction::Make(FastSwap64));
13621362

1363-
structValidationResult {
1364-
bool is_valid;
1365-
bool was_detached;
1366-
};
1367-
1368-
static ValidationResult ValidateUtf8(Local<Value> value) {
1363+
staticboolValidateUtf8(Local<Value> value) {
13691364
ArrayBufferViewContents<char> abv(value);
1370-
bool was_detached = abv.WasDetached();
1371-
return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
1372-
was_detached};
1365+
return abv.length() == 0 || simdutf::validate_utf8(abv.data(), abv.length());
13731366
}
13741367

13751368
staticvoidIsUtf8(const FunctionCallbackInfo<Value>& args) {
1376-
Environment* env = Environment::GetCurrent(args);
13771369
CHECK_EQ(args.Length(), 1);
13781370
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
13791371
args[0]->IsSharedArrayBuffer());
13801372

1381-
const ValidationResult result = ValidateUtf8(args[0]);
1382-
if (result.was_detached) {
1383-
returnnode::THROW_ERR_INVALID_STATE(
1384-
env, "Cannot validate on a detached buffer");
1385-
}
1386-
1387-
args.GetReturnValue().Set(result.is_valid);
1373+
args.GetReturnValue().Set(ValidateUtf8(args[0]));
13881374
}
13891375

13901376
staticboolFastIsUtf8(Local<Value> receiver,
@@ -1393,40 +1379,23 @@ static bool FastIsUtf8(Local<Value> receiver,
13931379
FastApiCallbackOptions& options) {
13941380
TRACK_V8_FAST_API_CALL("buffer.isUtf8");
13951381
HandleScope scope(options.isolate);
1396-
1397-
const ValidationResult result = ValidateUtf8(value);
1398-
if (result.was_detached) {
1399-
node::THROW_ERR_INVALID_STATE(options.isolate,
1400-
"Cannot validate on a detached buffer");
1401-
returnfalse;
1402-
}
1403-
return result.is_valid;
1382+
returnValidateUtf8(value);
14041383
}
14051384

14061385
static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
14071386

1408-
staticValidationResultValidateAscii(Local<Value> value) {
1387+
staticboolValidateAscii(Local<Value> value) {
14091388
ArrayBufferViewContents<char> abv(value);
1410-
bool was_detached = abv.WasDetached();
1411-
return {
1412-
!was_detached &&
1413-
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,
1414-
was_detached};
1389+
return abv.length() == 0 ||
1390+
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
14151391
}
14161392

14171393
staticvoidIsAscii(const FunctionCallbackInfo<Value>& args) {
1418-
Environment* env = Environment::GetCurrent(args);
14191394
CHECK_EQ(args.Length(), 1);
14201395
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
14211396
args[0]->IsSharedArrayBuffer());
14221397

1423-
const ValidationResult result = ValidateAscii(args[0]);
1424-
if (result.was_detached) {
1425-
returnnode::THROW_ERR_INVALID_STATE(
1426-
env, "Cannot validate on a detached buffer");
1427-
}
1428-
1429-
args.GetReturnValue().Set(result.is_valid);
1398+
args.GetReturnValue().Set(ValidateAscii(args[0]));
14301399
}
14311400

14321401
staticboolFastIsAscii(Local<Value> receiver,
@@ -1435,14 +1404,7 @@ static bool FastIsAscii(Local<Value> receiver,
14351404
FastApiCallbackOptions& options) {
14361405
TRACK_V8_FAST_API_CALL("buffer.isAscii");
14371406
HandleScope scope(options.isolate);
1438-
1439-
const ValidationResult result = ValidateAscii(value);
1440-
if (result.was_detached) {
1441-
node::THROW_ERR_INVALID_STATE(options.isolate,
1442-
"Cannot validate on a detached buffer");
1443-
returnfalse;
1444-
}
1445-
return result.is_valid;
1407+
returnValidateAscii(value);
14461408
}
14471409

14481410
static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));

‎test/parallel/test-buffer-isascii.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);
3030
});
3131

3232
{
33-
// Test with detached array buffers
34-
constarrayBuffer=newArrayBuffer(1024);
33+
// Detached array buffers and views are treated as empty.
34+
constarrayBuffer=newArrayBuffer(1);
35+
consttypedArray=newUint8Array(arrayBuffer);
36+
typedArray[0]=0xff;
37+
constinputs=[
38+
arrayBuffer,
39+
typedArray,
40+
Buffer.from(arrayBuffer),
41+
];
42+
for(constinputofinputs){
43+
assert.strictEqual(isAscii(input),false);
44+
}
3545
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
36-
assert.throws(
37-
()=>{isAscii(arrayBuffer);},
38-
{
39-
code: 'ERR_INVALID_STATE'
40-
}
41-
);
46+
for(constinputofinputs){
47+
assert.strictEqual(isAscii(input),true);
48+
}
4249
}

‎test/parallel/test-buffer-isutf8.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);
7474
});
7575

7676
{
77-
// Test with detached array buffers
78-
constarrayBuffer=newArrayBuffer(1024);
77+
// Detached array buffers and views are treated as empty.
78+
constarrayBuffer=newArrayBuffer(1);
79+
consttypedArray=newUint8Array(arrayBuffer);
80+
typedArray[0]=0xff;
81+
constinputs=[
82+
arrayBuffer,
83+
typedArray,
84+
Buffer.from(arrayBuffer),
85+
];
86+
for(constinputofinputs){
87+
assert.strictEqual(isUtf8(input),false);
88+
}
7989
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
80-
assert.throws(
81-
()=>{isUtf8(arrayBuffer);},
82-
{
83-
code: 'ERR_INVALID_STATE'
84-
}
85-
);
90+
for(constinputofinputs){
91+
assert.strictEqual(isUtf8(input),true);
92+
}
8693
}

0 commit comments

Comments
 (0)
, '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

Commit bc6b630

Browse files
Archkonaduh95
authored andcommitted
buffer: treat detached ArrayBuffers as empty
Treat detached ArrayBuffers and Buffer or TypedArray views backed by them as zero-length inputs in buffer.isUtf8() and buffer.isAscii(). Both functions now return true for these inputs, consistent with other empty inputs. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64504Fixes: #64503 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6deeef1 commit bc6b630

4 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎doc/api/buffer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,6 +5317,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa
53175317
added:
53185318
- v19.6.0
53195319
- v18.15.0
5320+
changes:
5321+
- version: REPLACEME
5322+
pr-url: https://github.com/nodejs/node/pull/64504
5323+
description: Detached `ArrayBuffer`s and views backed by them are treated
5324+
as empty.
53205325
-->
53215326

53225327
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5325,14 +5330,19 @@ added:
53255330
This function returns `true` if `input` contains only valid ASCII-encoded data,
53265331
including the case in which `input` is empty.
53275332

5328-
Throws if the `input` is a detached array buffer.
5333+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53295334

53305335
### `buffer.isUtf8(input)`
53315336

53325337
<!-- YAML
53335338
added:
53345339
- v19.4.0
53355340
- v18.14.0
5341+
changes:
5342+
- version: REPLACEME
5343+
pr-url: https://github.com/nodejs/node/pull/64504
5344+
description: Detached `ArrayBuffer`s and views backed by them are treated
5345+
as empty.
53365346
-->
53375347

53385348
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5341,7 +5351,7 @@ added:
53415351
This function returns `true` if `input` contains only valid UTF-8-encoded data,
53425352
including the case in which `input` is empty.
53435353

5344-
Throws if the `input` is a detached array buffer.
5354+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53455355

53465356
### `buffer.INSPECT_MAX_BYTES`
53475357

‎src/node_buffer.cc‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,31 +1360,17 @@ void FastSwap64(Local<Value> receiver,
13601360

13611361
static CFunction fast_swap64(CFunction::Make(FastSwap64));
13621362

1363-
structValidationResult {
1364-
bool is_valid;
1365-
bool was_detached;
1366-
};
1367-
1368-
static ValidationResult ValidateUtf8(Local<Value> value) {
1363+
staticboolValidateUtf8(Local<Value> value) {
13691364
ArrayBufferViewContents<char> abv(value);
1370-
bool was_detached = abv.WasDetached();
1371-
return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
1372-
was_detached};
1365+
return abv.length() == 0 || simdutf::validate_utf8(abv.data(), abv.length());
13731366
}
13741367

13751368
staticvoidIsUtf8(const FunctionCallbackInfo<Value>& args) {
1376-
Environment* env = Environment::GetCurrent(args);
13771369
CHECK_EQ(args.Length(), 1);
13781370
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
13791371
args[0]->IsSharedArrayBuffer());
13801372

1381-
const ValidationResult result = ValidateUtf8(args[0]);
1382-
if (result.was_detached) {
1383-
returnnode::THROW_ERR_INVALID_STATE(
1384-
env, "Cannot validate on a detached buffer");
1385-
}
1386-
1387-
args.GetReturnValue().Set(result.is_valid);
1373+
args.GetReturnValue().Set(ValidateUtf8(args[0]));
13881374
}
13891375

13901376
staticboolFastIsUtf8(Local<Value> receiver,
@@ -1393,40 +1379,23 @@ static bool FastIsUtf8(Local<Value> receiver,
13931379
FastApiCallbackOptions& options) {
13941380
TRACK_V8_FAST_API_CALL("buffer.isUtf8");
13951381
HandleScope scope(options.isolate);
1396-
1397-
const ValidationResult result = ValidateUtf8(value);
1398-
if (result.was_detached) {
1399-
node::THROW_ERR_INVALID_STATE(options.isolate,
1400-
"Cannot validate on a detached buffer");
1401-
returnfalse;
1402-
}
1403-
return result.is_valid;
1382+
returnValidateUtf8(value);
14041383
}
14051384

14061385
static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
14071386

1408-
staticValidationResultValidateAscii(Local<Value> value) {
1387+
staticboolValidateAscii(Local<Value> value) {
14091388
ArrayBufferViewContents<char> abv(value);
1410-
bool was_detached = abv.WasDetached();
1411-
return {
1412-
!was_detached &&
1413-
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,
1414-
was_detached};
1389+
return abv.length() == 0 ||
1390+
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
14151391
}
14161392

14171393
staticvoidIsAscii(const FunctionCallbackInfo<Value>& args) {
1418-
Environment* env = Environment::GetCurrent(args);
14191394
CHECK_EQ(args.Length(), 1);
14201395
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
14211396
args[0]->IsSharedArrayBuffer());
14221397

1423-
const ValidationResult result = ValidateAscii(args[0]);
1424-
if (result.was_detached) {
1425-
returnnode::THROW_ERR_INVALID_STATE(
1426-
env, "Cannot validate on a detached buffer");
1427-
}
1428-
1429-
args.GetReturnValue().Set(result.is_valid);
1398+
args.GetReturnValue().Set(ValidateAscii(args[0]));
14301399
}
14311400

14321401
staticboolFastIsAscii(Local<Value> receiver,
@@ -1435,14 +1404,7 @@ static bool FastIsAscii(Local<Value> receiver,
14351404
FastApiCallbackOptions& options) {
14361405
TRACK_V8_FAST_API_CALL("buffer.isAscii");
14371406
HandleScope scope(options.isolate);
1438-
1439-
const ValidationResult result = ValidateAscii(value);
1440-
if (result.was_detached) {
1441-
node::THROW_ERR_INVALID_STATE(options.isolate,
1442-
"Cannot validate on a detached buffer");
1443-
returnfalse;
1444-
}
1445-
return result.is_valid;
1407+
returnValidateAscii(value);
14461408
}
14471409

14481410
static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));

‎test/parallel/test-buffer-isascii.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);
3030
});
3131

3232
{
33-
// Test with detached array buffers
34-
constarrayBuffer=newArrayBuffer(1024);
33+
// Detached array buffers and views are treated as empty.
34+
constarrayBuffer=newArrayBuffer(1);
35+
consttypedArray=newUint8Array(arrayBuffer);
36+
typedArray[0]=0xff;
37+
constinputs=[
38+
arrayBuffer,
39+
typedArray,
40+
Buffer.from(arrayBuffer),
41+
];
42+
for(constinputofinputs){
43+
assert.strictEqual(isAscii(input),false);
44+
}
3545
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
36-
assert.throws(
37-
()=>{isAscii(arrayBuffer);},
38-
{
39-
code: 'ERR_INVALID_STATE'
40-
}
41-
);
46+
for(constinputofinputs){
47+
assert.strictEqual(isAscii(input),true);
48+
}
4249
}

‎test/parallel/test-buffer-isutf8.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);
7474
});
7575

7676
{
77-
// Test with detached array buffers
78-
constarrayBuffer=newArrayBuffer(1024);
77+
// Detached array buffers and views are treated as empty.
78+
constarrayBuffer=newArrayBuffer(1);
79+
consttypedArray=newUint8Array(arrayBuffer);
80+
typedArray[0]=0xff;
81+
constinputs=[
82+
arrayBuffer,
83+
typedArray,
84+
Buffer.from(arrayBuffer),
85+
];
86+
for(constinputofinputs){
87+
assert.strictEqual(isUtf8(input),false);
88+
}
7989
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
80-
assert.throws(
81-
()=>{isUtf8(arrayBuffer);},
82-
{
83-
code: 'ERR_INVALID_STATE'
84-
}
85-
);
90+
for(constinputofinputs){
91+
assert.strictEqual(isUtf8(input),true);
92+
}
8693
}

0 commit comments

Comments
 (0)
, '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

Commit bc6b630

Browse files
Archkonaduh95
authored andcommitted
buffer: treat detached ArrayBuffers as empty
Treat detached ArrayBuffers and Buffer or TypedArray views backed by them as zero-length inputs in buffer.isUtf8() and buffer.isAscii(). Both functions now return true for these inputs, consistent with other empty inputs. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64504Fixes: #64503 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6deeef1 commit bc6b630

4 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎doc/api/buffer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,6 +5317,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa
53175317
added:
53185318
- v19.6.0
53195319
- v18.15.0
5320+
changes:
5321+
- version: REPLACEME
5322+
pr-url: https://github.com/nodejs/node/pull/64504
5323+
description: Detached `ArrayBuffer`s and views backed by them are treated
5324+
as empty.
53205325
-->
53215326

53225327
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5325,14 +5330,19 @@ added:
53255330
This function returns `true` if `input` contains only valid ASCII-encoded data,
53265331
including the case in which `input` is empty.
53275332

5328-
Throws if the `input` is a detached array buffer.
5333+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53295334

53305335
### `buffer.isUtf8(input)`
53315336

53325337
<!-- YAML
53335338
added:
53345339
- v19.4.0
53355340
- v18.14.0
5341+
changes:
5342+
- version: REPLACEME
5343+
pr-url: https://github.com/nodejs/node/pull/64504
5344+
description: Detached `ArrayBuffer`s and views backed by them are treated
5345+
as empty.
53365346
-->
53375347

53385348
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5341,7 +5351,7 @@ added:
53415351
This function returns `true` if `input` contains only valid UTF-8-encoded data,
53425352
including the case in which `input` is empty.
53435353

5344-
Throws if the `input` is a detached array buffer.
5354+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53455355

53465356
### `buffer.INSPECT_MAX_BYTES`
53475357

‎src/node_buffer.cc‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,31 +1360,17 @@ void FastSwap64(Local<Value> receiver,
13601360

13611361
static CFunction fast_swap64(CFunction::Make(FastSwap64));
13621362

1363-
structValidationResult {
1364-
bool is_valid;
1365-
bool was_detached;
1366-
};
1367-
1368-
static ValidationResult ValidateUtf8(Local<Value> value) {
1363+
staticboolValidateUtf8(Local<Value> value) {
13691364
ArrayBufferViewContents<char> abv(value);
1370-
bool was_detached = abv.WasDetached();
1371-
return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
1372-
was_detached};
1365+
return abv.length() == 0 || simdutf::validate_utf8(abv.data(), abv.length());
13731366
}
13741367

13751368
staticvoidIsUtf8(const FunctionCallbackInfo<Value>& args) {
1376-
Environment* env = Environment::GetCurrent(args);
13771369
CHECK_EQ(args.Length(), 1);
13781370
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
13791371
args[0]->IsSharedArrayBuffer());
13801372

1381-
const ValidationResult result = ValidateUtf8(args[0]);
1382-
if (result.was_detached) {
1383-
returnnode::THROW_ERR_INVALID_STATE(
1384-
env, "Cannot validate on a detached buffer");
1385-
}
1386-
1387-
args.GetReturnValue().Set(result.is_valid);
1373+
args.GetReturnValue().Set(ValidateUtf8(args[0]));
13881374
}
13891375

13901376
staticboolFastIsUtf8(Local<Value> receiver,
@@ -1393,40 +1379,23 @@ static bool FastIsUtf8(Local<Value> receiver,
13931379
FastApiCallbackOptions& options) {
13941380
TRACK_V8_FAST_API_CALL("buffer.isUtf8");
13951381
HandleScope scope(options.isolate);
1396-
1397-
const ValidationResult result = ValidateUtf8(value);
1398-
if (result.was_detached) {
1399-
node::THROW_ERR_INVALID_STATE(options.isolate,
1400-
"Cannot validate on a detached buffer");
1401-
returnfalse;
1402-
}
1403-
return result.is_valid;
1382+
returnValidateUtf8(value);
14041383
}
14051384

14061385
static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
14071386

1408-
staticValidationResultValidateAscii(Local<Value> value) {
1387+
staticboolValidateAscii(Local<Value> value) {
14091388
ArrayBufferViewContents<char> abv(value);
1410-
bool was_detached = abv.WasDetached();
1411-
return {
1412-
!was_detached &&
1413-
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,
1414-
was_detached};
1389+
return abv.length() == 0 ||
1390+
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
14151391
}
14161392

14171393
staticvoidIsAscii(const FunctionCallbackInfo<Value>& args) {
1418-
Environment* env = Environment::GetCurrent(args);
14191394
CHECK_EQ(args.Length(), 1);
14201395
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
14211396
args[0]->IsSharedArrayBuffer());
14221397

1423-
const ValidationResult result = ValidateAscii(args[0]);
1424-
if (result.was_detached) {
1425-
returnnode::THROW_ERR_INVALID_STATE(
1426-
env, "Cannot validate on a detached buffer");
1427-
}
1428-
1429-
args.GetReturnValue().Set(result.is_valid);
1398+
args.GetReturnValue().Set(ValidateAscii(args[0]));
14301399
}
14311400

14321401
staticboolFastIsAscii(Local<Value> receiver,
@@ -1435,14 +1404,7 @@ static bool FastIsAscii(Local<Value> receiver,
14351404
FastApiCallbackOptions& options) {
14361405
TRACK_V8_FAST_API_CALL("buffer.isAscii");
14371406
HandleScope scope(options.isolate);
1438-
1439-
const ValidationResult result = ValidateAscii(value);
1440-
if (result.was_detached) {
1441-
node::THROW_ERR_INVALID_STATE(options.isolate,
1442-
"Cannot validate on a detached buffer");
1443-
returnfalse;
1444-
}
1445-
return result.is_valid;
1407+
returnValidateAscii(value);
14461408
}
14471409

14481410
static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));

‎test/parallel/test-buffer-isascii.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);
3030
});
3131

3232
{
33-
// Test with detached array buffers
34-
constarrayBuffer=newArrayBuffer(1024);
33+
// Detached array buffers and views are treated as empty.
34+
constarrayBuffer=newArrayBuffer(1);
35+
consttypedArray=newUint8Array(arrayBuffer);
36+
typedArray[0]=0xff;
37+
constinputs=[
38+
arrayBuffer,
39+
typedArray,
40+
Buffer.from(arrayBuffer),
41+
];
42+
for(constinputofinputs){
43+
assert.strictEqual(isAscii(input),false);
44+
}
3545
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
36-
assert.throws(
37-
()=>{isAscii(arrayBuffer);},
38-
{
39-
code: 'ERR_INVALID_STATE'
40-
}
41-
);
46+
for(constinputofinputs){
47+
assert.strictEqual(isAscii(input),true);
48+
}
4249
}

‎test/parallel/test-buffer-isutf8.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);
7474
});
7575

7676
{
77-
// Test with detached array buffers
78-
constarrayBuffer=newArrayBuffer(1024);
77+
// Detached array buffers and views are treated as empty.
78+
constarrayBuffer=newArrayBuffer(1);
79+
consttypedArray=newUint8Array(arrayBuffer);
80+
typedArray[0]=0xff;
81+
constinputs=[
82+
arrayBuffer,
83+
typedArray,
84+
Buffer.from(arrayBuffer),
85+
];
86+
for(constinputofinputs){
87+
assert.strictEqual(isUtf8(input),false);
88+
}
7989
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
80-
assert.throws(
81-
()=>{isUtf8(arrayBuffer);},
82-
{
83-
code: 'ERR_INVALID_STATE'
84-
}
85-
);
90+
for(constinputofinputs){
91+
assert.strictEqual(isUtf8(input),true);
92+
}
8693
}

0 commit comments

Comments
 (0)
, '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

Commit bc6b630

Browse files
Archkonaduh95
authored andcommitted
buffer: treat detached ArrayBuffers as empty
Treat detached ArrayBuffers and Buffer or TypedArray views backed by them as zero-length inputs in buffer.isUtf8() and buffer.isAscii(). Both functions now return true for these inputs, consistent with other empty inputs. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64504Fixes: #64503 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6deeef1 commit bc6b630

4 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎doc/api/buffer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,6 +5317,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa
53175317
added:
53185318
- v19.6.0
53195319
- v18.15.0
5320+
changes:
5321+
- version: REPLACEME
5322+
pr-url: https://github.com/nodejs/node/pull/64504
5323+
description: Detached `ArrayBuffer`s and views backed by them are treated
5324+
as empty.
53205325
-->
53215326

53225327
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5325,14 +5330,19 @@ added:
53255330
This function returns `true` if `input` contains only valid ASCII-encoded data,
53265331
including the case in which `input` is empty.
53275332

5328-
Throws if the `input` is a detached array buffer.
5333+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53295334

53305335
### `buffer.isUtf8(input)`
53315336

53325337
<!-- YAML
53335338
added:
53345339
- v19.4.0
53355340
- v18.14.0
5341+
changes:
5342+
- version: REPLACEME
5343+
pr-url: https://github.com/nodejs/node/pull/64504
5344+
description: Detached `ArrayBuffer`s and views backed by them are treated
5345+
as empty.
53365346
-->
53375347

53385348
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5341,7 +5351,7 @@ added:
53415351
This function returns `true` if `input` contains only valid UTF-8-encoded data,
53425352
including the case in which `input` is empty.
53435353

5344-
Throws if the `input` is a detached array buffer.
5354+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53455355

53465356
### `buffer.INSPECT_MAX_BYTES`
53475357

‎src/node_buffer.cc‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,31 +1360,17 @@ void FastSwap64(Local<Value> receiver,
13601360

13611361
static CFunction fast_swap64(CFunction::Make(FastSwap64));
13621362

1363-
structValidationResult {
1364-
bool is_valid;
1365-
bool was_detached;
1366-
};
1367-
1368-
static ValidationResult ValidateUtf8(Local<Value> value) {
1363+
staticboolValidateUtf8(Local<Value> value) {
13691364
ArrayBufferViewContents<char> abv(value);
1370-
bool was_detached = abv.WasDetached();
1371-
return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
1372-
was_detached};
1365+
return abv.length() == 0 || simdutf::validate_utf8(abv.data(), abv.length());
13731366
}
13741367

13751368
staticvoidIsUtf8(const FunctionCallbackInfo<Value>& args) {
1376-
Environment* env = Environment::GetCurrent(args);
13771369
CHECK_EQ(args.Length(), 1);
13781370
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
13791371
args[0]->IsSharedArrayBuffer());
13801372

1381-
const ValidationResult result = ValidateUtf8(args[0]);
1382-
if (result.was_detached) {
1383-
returnnode::THROW_ERR_INVALID_STATE(
1384-
env, "Cannot validate on a detached buffer");
1385-
}
1386-
1387-
args.GetReturnValue().Set(result.is_valid);
1373+
args.GetReturnValue().Set(ValidateUtf8(args[0]));
13881374
}
13891375

13901376
staticboolFastIsUtf8(Local<Value> receiver,
@@ -1393,40 +1379,23 @@ static bool FastIsUtf8(Local<Value> receiver,
13931379
FastApiCallbackOptions& options) {
13941380
TRACK_V8_FAST_API_CALL("buffer.isUtf8");
13951381
HandleScope scope(options.isolate);
1396-
1397-
const ValidationResult result = ValidateUtf8(value);
1398-
if (result.was_detached) {
1399-
node::THROW_ERR_INVALID_STATE(options.isolate,
1400-
"Cannot validate on a detached buffer");
1401-
returnfalse;
1402-
}
1403-
return result.is_valid;
1382+
returnValidateUtf8(value);
14041383
}
14051384

14061385
static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
14071386

1408-
staticValidationResultValidateAscii(Local<Value> value) {
1387+
staticboolValidateAscii(Local<Value> value) {
14091388
ArrayBufferViewContents<char> abv(value);
1410-
bool was_detached = abv.WasDetached();
1411-
return {
1412-
!was_detached &&
1413-
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,
1414-
was_detached};
1389+
return abv.length() == 0 ||
1390+
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
14151391
}
14161392

14171393
staticvoidIsAscii(const FunctionCallbackInfo<Value>& args) {
1418-
Environment* env = Environment::GetCurrent(args);
14191394
CHECK_EQ(args.Length(), 1);
14201395
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
14211396
args[0]->IsSharedArrayBuffer());
14221397

1423-
const ValidationResult result = ValidateAscii(args[0]);
1424-
if (result.was_detached) {
1425-
returnnode::THROW_ERR_INVALID_STATE(
1426-
env, "Cannot validate on a detached buffer");
1427-
}
1428-
1429-
args.GetReturnValue().Set(result.is_valid);
1398+
args.GetReturnValue().Set(ValidateAscii(args[0]));
14301399
}
14311400

14321401
staticboolFastIsAscii(Local<Value> receiver,
@@ -1435,14 +1404,7 @@ static bool FastIsAscii(Local<Value> receiver,
14351404
FastApiCallbackOptions& options) {
14361405
TRACK_V8_FAST_API_CALL("buffer.isAscii");
14371406
HandleScope scope(options.isolate);
1438-
1439-
const ValidationResult result = ValidateAscii(value);
1440-
if (result.was_detached) {
1441-
node::THROW_ERR_INVALID_STATE(options.isolate,
1442-
"Cannot validate on a detached buffer");
1443-
returnfalse;
1444-
}
1445-
return result.is_valid;
1407+
returnValidateAscii(value);
14461408
}
14471409

14481410
static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));

‎test/parallel/test-buffer-isascii.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);
3030
});
3131

3232
{
33-
// Test with detached array buffers
34-
constarrayBuffer=newArrayBuffer(1024);
33+
// Detached array buffers and views are treated as empty.
34+
constarrayBuffer=newArrayBuffer(1);
35+
consttypedArray=newUint8Array(arrayBuffer);
36+
typedArray[0]=0xff;
37+
constinputs=[
38+
arrayBuffer,
39+
typedArray,
40+
Buffer.from(arrayBuffer),
41+
];
42+
for(constinputofinputs){
43+
assert.strictEqual(isAscii(input),false);
44+
}
3545
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
36-
assert.throws(
37-
()=>{isAscii(arrayBuffer);},
38-
{
39-
code: 'ERR_INVALID_STATE'
40-
}
41-
);
46+
for(constinputofinputs){
47+
assert.strictEqual(isAscii(input),true);
48+
}
4249
}

‎test/parallel/test-buffer-isutf8.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);
7474
});
7575

7676
{
77-
// Test with detached array buffers
78-
constarrayBuffer=newArrayBuffer(1024);
77+
// Detached array buffers and views are treated as empty.
78+
constarrayBuffer=newArrayBuffer(1);
79+
consttypedArray=newUint8Array(arrayBuffer);
80+
typedArray[0]=0xff;
81+
constinputs=[
82+
arrayBuffer,
83+
typedArray,
84+
Buffer.from(arrayBuffer),
85+
];
86+
for(constinputofinputs){
87+
assert.strictEqual(isUtf8(input),false);
88+
}
7989
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
80-
assert.throws(
81-
()=>{isUtf8(arrayBuffer);},
82-
{
83-
code: 'ERR_INVALID_STATE'
84-
}
85-
);
90+
for(constinputofinputs){
91+
assert.strictEqual(isUtf8(input),true);
92+
}
8693
}

0 commit comments

Comments
 (0)
, '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

Commit bc6b630

Browse files
Archkonaduh95
authored andcommitted
buffer: treat detached ArrayBuffers as empty
Treat detached ArrayBuffers and Buffer or TypedArray views backed by them as zero-length inputs in buffer.isUtf8() and buffer.isAscii(). Both functions now return true for these inputs, consistent with other empty inputs. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64504Fixes: #64503 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6deeef1 commit bc6b630

4 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎doc/api/buffer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,6 +5317,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa
53175317
added:
53185318
- v19.6.0
53195319
- v18.15.0
5320+
changes:
5321+
- version: REPLACEME
5322+
pr-url: https://github.com/nodejs/node/pull/64504
5323+
description: Detached `ArrayBuffer`s and views backed by them are treated
5324+
as empty.
53205325
-->
53215326

53225327
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5325,14 +5330,19 @@ added:
53255330
This function returns `true` if `input` contains only valid ASCII-encoded data,
53265331
including the case in which `input` is empty.
53275332

5328-
Throws if the `input` is a detached array buffer.
5333+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53295334

53305335
### `buffer.isUtf8(input)`
53315336

53325337
<!-- YAML
53335338
added:
53345339
- v19.4.0
53355340
- v18.14.0
5341+
changes:
5342+
- version: REPLACEME
5343+
pr-url: https://github.com/nodejs/node/pull/64504
5344+
description: Detached `ArrayBuffer`s and views backed by them are treated
5345+
as empty.
53365346
-->
53375347

53385348
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5341,7 +5351,7 @@ added:
53415351
This function returns `true` if `input` contains only valid UTF-8-encoded data,
53425352
including the case in which `input` is empty.
53435353

5344-
Throws if the `input` is a detached array buffer.
5354+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53455355

53465356
### `buffer.INSPECT_MAX_BYTES`
53475357

‎src/node_buffer.cc‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,31 +1360,17 @@ void FastSwap64(Local<Value> receiver,
13601360

13611361
static CFunction fast_swap64(CFunction::Make(FastSwap64));
13621362

1363-
structValidationResult {
1364-
bool is_valid;
1365-
bool was_detached;
1366-
};
1367-
1368-
static ValidationResult ValidateUtf8(Local<Value> value) {
1363+
staticboolValidateUtf8(Local<Value> value) {
13691364
ArrayBufferViewContents<char> abv(value);
1370-
bool was_detached = abv.WasDetached();
1371-
return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
1372-
was_detached};
1365+
return abv.length() == 0 || simdutf::validate_utf8(abv.data(), abv.length());
13731366
}
13741367

13751368
staticvoidIsUtf8(const FunctionCallbackInfo<Value>& args) {
1376-
Environment* env = Environment::GetCurrent(args);
13771369
CHECK_EQ(args.Length(), 1);
13781370
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
13791371
args[0]->IsSharedArrayBuffer());
13801372

1381-
const ValidationResult result = ValidateUtf8(args[0]);
1382-
if (result.was_detached) {
1383-
returnnode::THROW_ERR_INVALID_STATE(
1384-
env, "Cannot validate on a detached buffer");
1385-
}
1386-
1387-
args.GetReturnValue().Set(result.is_valid);
1373+
args.GetReturnValue().Set(ValidateUtf8(args[0]));
13881374
}
13891375

13901376
staticboolFastIsUtf8(Local<Value> receiver,
@@ -1393,40 +1379,23 @@ static bool FastIsUtf8(Local<Value> receiver,
13931379
FastApiCallbackOptions& options) {
13941380
TRACK_V8_FAST_API_CALL("buffer.isUtf8");
13951381
HandleScope scope(options.isolate);
1396-
1397-
const ValidationResult result = ValidateUtf8(value);
1398-
if (result.was_detached) {
1399-
node::THROW_ERR_INVALID_STATE(options.isolate,
1400-
"Cannot validate on a detached buffer");
1401-
returnfalse;
1402-
}
1403-
return result.is_valid;
1382+
returnValidateUtf8(value);
14041383
}
14051384

14061385
static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
14071386

1408-
staticValidationResultValidateAscii(Local<Value> value) {
1387+
staticboolValidateAscii(Local<Value> value) {
14091388
ArrayBufferViewContents<char> abv(value);
1410-
bool was_detached = abv.WasDetached();
1411-
return {
1412-
!was_detached &&
1413-
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,
1414-
was_detached};
1389+
return abv.length() == 0 ||
1390+
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
14151391
}
14161392

14171393
staticvoidIsAscii(const FunctionCallbackInfo<Value>& args) {
1418-
Environment* env = Environment::GetCurrent(args);
14191394
CHECK_EQ(args.Length(), 1);
14201395
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
14211396
args[0]->IsSharedArrayBuffer());
14221397

1423-
const ValidationResult result = ValidateAscii(args[0]);
1424-
if (result.was_detached) {
1425-
returnnode::THROW_ERR_INVALID_STATE(
1426-
env, "Cannot validate on a detached buffer");
1427-
}
1428-
1429-
args.GetReturnValue().Set(result.is_valid);
1398+
args.GetReturnValue().Set(ValidateAscii(args[0]));
14301399
}
14311400

14321401
staticboolFastIsAscii(Local<Value> receiver,
@@ -1435,14 +1404,7 @@ static bool FastIsAscii(Local<Value> receiver,
14351404
FastApiCallbackOptions& options) {
14361405
TRACK_V8_FAST_API_CALL("buffer.isAscii");
14371406
HandleScope scope(options.isolate);
1438-
1439-
const ValidationResult result = ValidateAscii(value);
1440-
if (result.was_detached) {
1441-
node::THROW_ERR_INVALID_STATE(options.isolate,
1442-
"Cannot validate on a detached buffer");
1443-
returnfalse;
1444-
}
1445-
return result.is_valid;
1407+
returnValidateAscii(value);
14461408
}
14471409

14481410
static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));

‎test/parallel/test-buffer-isascii.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);
3030
});
3131

3232
{
33-
// Test with detached array buffers
34-
constarrayBuffer=newArrayBuffer(1024);
33+
// Detached array buffers and views are treated as empty.
34+
constarrayBuffer=newArrayBuffer(1);
35+
consttypedArray=newUint8Array(arrayBuffer);
36+
typedArray[0]=0xff;
37+
constinputs=[
38+
arrayBuffer,
39+
typedArray,
40+
Buffer.from(arrayBuffer),
41+
];
42+
for(constinputofinputs){
43+
assert.strictEqual(isAscii(input),false);
44+
}
3545
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
36-
assert.throws(
37-
()=>{isAscii(arrayBuffer);},
38-
{
39-
code: 'ERR_INVALID_STATE'
40-
}
41-
);
46+
for(constinputofinputs){
47+
assert.strictEqual(isAscii(input),true);
48+
}
4249
}

‎test/parallel/test-buffer-isutf8.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);
7474
});
7575

7676
{
77-
// Test with detached array buffers
78-
constarrayBuffer=newArrayBuffer(1024);
77+
// Detached array buffers and views are treated as empty.
78+
constarrayBuffer=newArrayBuffer(1);
79+
consttypedArray=newUint8Array(arrayBuffer);
80+
typedArray[0]=0xff;
81+
constinputs=[
82+
arrayBuffer,
83+
typedArray,
84+
Buffer.from(arrayBuffer),
85+
];
86+
for(constinputofinputs){
87+
assert.strictEqual(isUtf8(input),false);
88+
}
7989
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
80-
assert.throws(
81-
()=>{isUtf8(arrayBuffer);},
82-
{
83-
code: 'ERR_INVALID_STATE'
84-
}
85-
);
90+
for(constinputofinputs){
91+
assert.strictEqual(isUtf8(input),true);
92+
}
8693
}

0 commit comments

Comments
 (0)
, '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

Commit bc6b630

Browse files
Archkonaduh95
authored andcommitted
buffer: treat detached ArrayBuffers as empty
Treat detached ArrayBuffers and Buffer or TypedArray views backed by them as zero-length inputs in buffer.isUtf8() and buffer.isAscii(). Both functions now return true for these inputs, consistent with other empty inputs. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64504Fixes: #64503 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6deeef1 commit bc6b630

4 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎doc/api/buffer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,6 +5317,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa
53175317
added:
53185318
- v19.6.0
53195319
- v18.15.0
5320+
changes:
5321+
- version: REPLACEME
5322+
pr-url: https://github.com/nodejs/node/pull/64504
5323+
description: Detached `ArrayBuffer`s and views backed by them are treated
5324+
as empty.
53205325
-->
53215326

53225327
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5325,14 +5330,19 @@ added:
53255330
This function returns `true` if `input` contains only valid ASCII-encoded data,
53265331
including the case in which `input` is empty.
53275332

5328-
Throws if the `input` is a detached array buffer.
5333+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53295334

53305335
### `buffer.isUtf8(input)`
53315336

53325337
<!-- YAML
53335338
added:
53345339
- v19.4.0
53355340
- v18.14.0
5341+
changes:
5342+
- version: REPLACEME
5343+
pr-url: https://github.com/nodejs/node/pull/64504
5344+
description: Detached `ArrayBuffer`s and views backed by them are treated
5345+
as empty.
53365346
-->
53375347

53385348
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5341,7 +5351,7 @@ added:
53415351
This function returns `true` if `input` contains only valid UTF-8-encoded data,
53425352
including the case in which `input` is empty.
53435353

5344-
Throws if the `input` is a detached array buffer.
5354+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53455355

53465356
### `buffer.INSPECT_MAX_BYTES`
53475357

‎src/node_buffer.cc‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,31 +1360,17 @@ void FastSwap64(Local<Value> receiver,
13601360

13611361
static CFunction fast_swap64(CFunction::Make(FastSwap64));
13621362

1363-
structValidationResult {
1364-
bool is_valid;
1365-
bool was_detached;
1366-
};
1367-
1368-
static ValidationResult ValidateUtf8(Local<Value> value) {
1363+
staticboolValidateUtf8(Local<Value> value) {
13691364
ArrayBufferViewContents<char> abv(value);
1370-
bool was_detached = abv.WasDetached();
1371-
return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
1372-
was_detached};
1365+
return abv.length() == 0 || simdutf::validate_utf8(abv.data(), abv.length());
13731366
}
13741367

13751368
staticvoidIsUtf8(const FunctionCallbackInfo<Value>& args) {
1376-
Environment* env = Environment::GetCurrent(args);
13771369
CHECK_EQ(args.Length(), 1);
13781370
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
13791371
args[0]->IsSharedArrayBuffer());
13801372

1381-
const ValidationResult result = ValidateUtf8(args[0]);
1382-
if (result.was_detached) {
1383-
returnnode::THROW_ERR_INVALID_STATE(
1384-
env, "Cannot validate on a detached buffer");
1385-
}
1386-
1387-
args.GetReturnValue().Set(result.is_valid);
1373+
args.GetReturnValue().Set(ValidateUtf8(args[0]));
13881374
}
13891375

13901376
staticboolFastIsUtf8(Local<Value> receiver,
@@ -1393,40 +1379,23 @@ static bool FastIsUtf8(Local<Value> receiver,
13931379
FastApiCallbackOptions& options) {
13941380
TRACK_V8_FAST_API_CALL("buffer.isUtf8");
13951381
HandleScope scope(options.isolate);
1396-
1397-
const ValidationResult result = ValidateUtf8(value);
1398-
if (result.was_detached) {
1399-
node::THROW_ERR_INVALID_STATE(options.isolate,
1400-
"Cannot validate on a detached buffer");
1401-
returnfalse;
1402-
}
1403-
return result.is_valid;
1382+
returnValidateUtf8(value);
14041383
}
14051384

14061385
static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
14071386

1408-
staticValidationResultValidateAscii(Local<Value> value) {
1387+
staticboolValidateAscii(Local<Value> value) {
14091388
ArrayBufferViewContents<char> abv(value);
1410-
bool was_detached = abv.WasDetached();
1411-
return {
1412-
!was_detached &&
1413-
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,
1414-
was_detached};
1389+
return abv.length() == 0 ||
1390+
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
14151391
}
14161392

14171393
staticvoidIsAscii(const FunctionCallbackInfo<Value>& args) {
1418-
Environment* env = Environment::GetCurrent(args);
14191394
CHECK_EQ(args.Length(), 1);
14201395
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
14211396
args[0]->IsSharedArrayBuffer());
14221397

1423-
const ValidationResult result = ValidateAscii(args[0]);
1424-
if (result.was_detached) {
1425-
returnnode::THROW_ERR_INVALID_STATE(
1426-
env, "Cannot validate on a detached buffer");
1427-
}
1428-
1429-
args.GetReturnValue().Set(result.is_valid);
1398+
args.GetReturnValue().Set(ValidateAscii(args[0]));
14301399
}
14311400

14321401
staticboolFastIsAscii(Local<Value> receiver,
@@ -1435,14 +1404,7 @@ static bool FastIsAscii(Local<Value> receiver,
14351404
FastApiCallbackOptions& options) {
14361405
TRACK_V8_FAST_API_CALL("buffer.isAscii");
14371406
HandleScope scope(options.isolate);
1438-
1439-
const ValidationResult result = ValidateAscii(value);
1440-
if (result.was_detached) {
1441-
node::THROW_ERR_INVALID_STATE(options.isolate,
1442-
"Cannot validate on a detached buffer");
1443-
returnfalse;
1444-
}
1445-
return result.is_valid;
1407+
returnValidateAscii(value);
14461408
}
14471409

14481410
static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));

‎test/parallel/test-buffer-isascii.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);
3030
});
3131

3232
{
33-
// Test with detached array buffers
34-
constarrayBuffer=newArrayBuffer(1024);
33+
// Detached array buffers and views are treated as empty.
34+
constarrayBuffer=newArrayBuffer(1);
35+
consttypedArray=newUint8Array(arrayBuffer);
36+
typedArray[0]=0xff;
37+
constinputs=[
38+
arrayBuffer,
39+
typedArray,
40+
Buffer.from(arrayBuffer),
41+
];
42+
for(constinputofinputs){
43+
assert.strictEqual(isAscii(input),false);
44+
}
3545
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
36-
assert.throws(
37-
()=>{isAscii(arrayBuffer);},
38-
{
39-
code: 'ERR_INVALID_STATE'
40-
}
41-
);
46+
for(constinputofinputs){
47+
assert.strictEqual(isAscii(input),true);
48+
}
4249
}

‎test/parallel/test-buffer-isutf8.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);
7474
});
7575

7676
{
77-
// Test with detached array buffers
78-
constarrayBuffer=newArrayBuffer(1024);
77+
// Detached array buffers and views are treated as empty.
78+
constarrayBuffer=newArrayBuffer(1);
79+
consttypedArray=newUint8Array(arrayBuffer);
80+
typedArray[0]=0xff;
81+
constinputs=[
82+
arrayBuffer,
83+
typedArray,
84+
Buffer.from(arrayBuffer),
85+
];
86+
for(constinputofinputs){
87+
assert.strictEqual(isUtf8(input),false);
88+
}
7989
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
80-
assert.throws(
81-
()=>{isUtf8(arrayBuffer);},
82-
{
83-
code: 'ERR_INVALID_STATE'
84-
}
85-
);
90+
for(constinputofinputs){
91+
assert.strictEqual(isUtf8(input),true);
92+
}
8693
}

0 commit comments

Comments
 (0)
, '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

Commit bc6b630

Browse files
Archkonaduh95
authored andcommitted
buffer: treat detached ArrayBuffers as empty
Treat detached ArrayBuffers and Buffer or TypedArray views backed by them as zero-length inputs in buffer.isUtf8() and buffer.isAscii(). Both functions now return true for these inputs, consistent with other empty inputs. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64504Fixes: #64503 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6deeef1 commit bc6b630

4 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎doc/api/buffer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,6 +5317,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa
53175317
added:
53185318
- v19.6.0
53195319
- v18.15.0
5320+
changes:
5321+
- version: REPLACEME
5322+
pr-url: https://github.com/nodejs/node/pull/64504
5323+
description: Detached `ArrayBuffer`s and views backed by them are treated
5324+
as empty.
53205325
-->
53215326

53225327
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5325,14 +5330,19 @@ added:
53255330
This function returns `true` if `input` contains only valid ASCII-encoded data,
53265331
including the case in which `input` is empty.
53275332

5328-
Throws if the `input` is a detached array buffer.
5333+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53295334

53305335
### `buffer.isUtf8(input)`
53315336

53325337
<!-- YAML
53335338
added:
53345339
- v19.4.0
53355340
- v18.14.0
5341+
changes:
5342+
- version: REPLACEME
5343+
pr-url: https://github.com/nodejs/node/pull/64504
5344+
description: Detached `ArrayBuffer`s and views backed by them are treated
5345+
as empty.
53365346
-->
53375347

53385348
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5341,7 +5351,7 @@ added:
53415351
This function returns `true` if `input` contains only valid UTF-8-encoded data,
53425352
including the case in which `input` is empty.
53435353

5344-
Throws if the `input` is a detached array buffer.
5354+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53455355

53465356
### `buffer.INSPECT_MAX_BYTES`
53475357

‎src/node_buffer.cc‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,31 +1360,17 @@ void FastSwap64(Local<Value> receiver,
13601360

13611361
static CFunction fast_swap64(CFunction::Make(FastSwap64));
13621362

1363-
structValidationResult {
1364-
bool is_valid;
1365-
bool was_detached;
1366-
};
1367-
1368-
static ValidationResult ValidateUtf8(Local<Value> value) {
1363+
staticboolValidateUtf8(Local<Value> value) {
13691364
ArrayBufferViewContents<char> abv(value);
1370-
bool was_detached = abv.WasDetached();
1371-
return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
1372-
was_detached};
1365+
return abv.length() == 0 || simdutf::validate_utf8(abv.data(), abv.length());
13731366
}
13741367

13751368
staticvoidIsUtf8(const FunctionCallbackInfo<Value>& args) {
1376-
Environment* env = Environment::GetCurrent(args);
13771369
CHECK_EQ(args.Length(), 1);
13781370
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
13791371
args[0]->IsSharedArrayBuffer());
13801372

1381-
const ValidationResult result = ValidateUtf8(args[0]);
1382-
if (result.was_detached) {
1383-
returnnode::THROW_ERR_INVALID_STATE(
1384-
env, "Cannot validate on a detached buffer");
1385-
}
1386-
1387-
args.GetReturnValue().Set(result.is_valid);
1373+
args.GetReturnValue().Set(ValidateUtf8(args[0]));
13881374
}
13891375

13901376
staticboolFastIsUtf8(Local<Value> receiver,
@@ -1393,40 +1379,23 @@ static bool FastIsUtf8(Local<Value> receiver,
13931379
FastApiCallbackOptions& options) {
13941380
TRACK_V8_FAST_API_CALL("buffer.isUtf8");
13951381
HandleScope scope(options.isolate);
1396-
1397-
const ValidationResult result = ValidateUtf8(value);
1398-
if (result.was_detached) {
1399-
node::THROW_ERR_INVALID_STATE(options.isolate,
1400-
"Cannot validate on a detached buffer");
1401-
returnfalse;
1402-
}
1403-
return result.is_valid;
1382+
returnValidateUtf8(value);
14041383
}
14051384

14061385
static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
14071386

1408-
staticValidationResultValidateAscii(Local<Value> value) {
1387+
staticboolValidateAscii(Local<Value> value) {
14091388
ArrayBufferViewContents<char> abv(value);
1410-
bool was_detached = abv.WasDetached();
1411-
return {
1412-
!was_detached &&
1413-
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,
1414-
was_detached};
1389+
return abv.length() == 0 ||
1390+
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
14151391
}
14161392

14171393
staticvoidIsAscii(const FunctionCallbackInfo<Value>& args) {
1418-
Environment* env = Environment::GetCurrent(args);
14191394
CHECK_EQ(args.Length(), 1);
14201395
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
14211396
args[0]->IsSharedArrayBuffer());
14221397

1423-
const ValidationResult result = ValidateAscii(args[0]);
1424-
if (result.was_detached) {
1425-
returnnode::THROW_ERR_INVALID_STATE(
1426-
env, "Cannot validate on a detached buffer");
1427-
}
1428-
1429-
args.GetReturnValue().Set(result.is_valid);
1398+
args.GetReturnValue().Set(ValidateAscii(args[0]));
14301399
}
14311400

14321401
staticboolFastIsAscii(Local<Value> receiver,
@@ -1435,14 +1404,7 @@ static bool FastIsAscii(Local<Value> receiver,
14351404
FastApiCallbackOptions& options) {
14361405
TRACK_V8_FAST_API_CALL("buffer.isAscii");
14371406
HandleScope scope(options.isolate);
1438-
1439-
const ValidationResult result = ValidateAscii(value);
1440-
if (result.was_detached) {
1441-
node::THROW_ERR_INVALID_STATE(options.isolate,
1442-
"Cannot validate on a detached buffer");
1443-
returnfalse;
1444-
}
1445-
return result.is_valid;
1407+
returnValidateAscii(value);
14461408
}
14471409

14481410
static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));

‎test/parallel/test-buffer-isascii.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);
3030
});
3131

3232
{
33-
// Test with detached array buffers
34-
constarrayBuffer=newArrayBuffer(1024);
33+
// Detached array buffers and views are treated as empty.
34+
constarrayBuffer=newArrayBuffer(1);
35+
consttypedArray=newUint8Array(arrayBuffer);
36+
typedArray[0]=0xff;
37+
constinputs=[
38+
arrayBuffer,
39+
typedArray,
40+
Buffer.from(arrayBuffer),
41+
];
42+
for(constinputofinputs){
43+
assert.strictEqual(isAscii(input),false);
44+
}
3545
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
36-
assert.throws(
37-
()=>{isAscii(arrayBuffer);},
38-
{
39-
code: 'ERR_INVALID_STATE'
40-
}
41-
);
46+
for(constinputofinputs){
47+
assert.strictEqual(isAscii(input),true);
48+
}
4249
}

‎test/parallel/test-buffer-isutf8.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);
7474
});
7575

7676
{
77-
// Test with detached array buffers
78-
constarrayBuffer=newArrayBuffer(1024);
77+
// Detached array buffers and views are treated as empty.
78+
constarrayBuffer=newArrayBuffer(1);
79+
consttypedArray=newUint8Array(arrayBuffer);
80+
typedArray[0]=0xff;
81+
constinputs=[
82+
arrayBuffer,
83+
typedArray,
84+
Buffer.from(arrayBuffer),
85+
];
86+
for(constinputofinputs){
87+
assert.strictEqual(isUtf8(input),false);
88+
}
7989
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
80-
assert.throws(
81-
()=>{isUtf8(arrayBuffer);},
82-
{
83-
code: 'ERR_INVALID_STATE'
84-
}
85-
);
90+
for(constinputofinputs){
91+
assert.strictEqual(isUtf8(input),true);
92+
}
8693
}

0 commit comments

Comments
 (0)
, '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

Commit bc6b630

Browse files
Archkonaduh95
authored andcommitted
buffer: treat detached ArrayBuffers as empty
Treat detached ArrayBuffers and Buffer or TypedArray views backed by them as zero-length inputs in buffer.isUtf8() and buffer.isAscii(). Both functions now return true for these inputs, consistent with other empty inputs. Signed-off-by: Archkon <180910180+Archkon@users.noreply.github.com> PR-URL: #64504Fixes: #64503 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6deeef1 commit bc6b630

4 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎doc/api/buffer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5317,6 +5317,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa
53175317
added:
53185318
- v19.6.0
53195319
- v18.15.0
5320+
changes:
5321+
- version: REPLACEME
5322+
pr-url: https://github.com/nodejs/node/pull/64504
5323+
description: Detached `ArrayBuffer`s and views backed by them are treated
5324+
as empty.
53205325
-->
53215326

53225327
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5325,14 +5330,19 @@ added:
53255330
This function returns `true` if `input` contains only valid ASCII-encoded data,
53265331
including the case in which `input` is empty.
53275332

5328-
Throws if the `input` is a detached array buffer.
5333+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53295334

53305335
### `buffer.isUtf8(input)`
53315336

53325337
<!-- YAML
53335338
added:
53345339
- v19.4.0
53355340
- v18.14.0
5341+
changes:
5342+
- version: REPLACEME
5343+
pr-url: https://github.com/nodejs/node/pull/64504
5344+
description: Detached `ArrayBuffer`s and views backed by them are treated
5345+
as empty.
53365346
-->
53375347

53385348
*`input` {Buffer | ArrayBuffer | TypedArray} The input to validate.
@@ -5341,7 +5351,7 @@ added:
53415351
This function returns `true` if `input` contains only valid UTF-8-encoded data,
53425352
including the case in which `input` is empty.
53435353

5344-
Throws if the `input` is a detached array buffer.
5354+
A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
53455355

53465356
### `buffer.INSPECT_MAX_BYTES`
53475357

‎src/node_buffer.cc‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,31 +1360,17 @@ void FastSwap64(Local<Value> receiver,
13601360

13611361
static CFunction fast_swap64(CFunction::Make(FastSwap64));
13621362

1363-
structValidationResult {
1364-
bool is_valid;
1365-
bool was_detached;
1366-
};
1367-
1368-
static ValidationResult ValidateUtf8(Local<Value> value) {
1363+
staticboolValidateUtf8(Local<Value> value) {
13691364
ArrayBufferViewContents<char> abv(value);
1370-
bool was_detached = abv.WasDetached();
1371-
return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
1372-
was_detached};
1365+
return abv.length() == 0 || simdutf::validate_utf8(abv.data(), abv.length());
13731366
}
13741367

13751368
staticvoidIsUtf8(const FunctionCallbackInfo<Value>& args) {
1376-
Environment* env = Environment::GetCurrent(args);
13771369
CHECK_EQ(args.Length(), 1);
13781370
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
13791371
args[0]->IsSharedArrayBuffer());
13801372

1381-
const ValidationResult result = ValidateUtf8(args[0]);
1382-
if (result.was_detached) {
1383-
returnnode::THROW_ERR_INVALID_STATE(
1384-
env, "Cannot validate on a detached buffer");
1385-
}
1386-
1387-
args.GetReturnValue().Set(result.is_valid);
1373+
args.GetReturnValue().Set(ValidateUtf8(args[0]));
13881374
}
13891375

13901376
staticboolFastIsUtf8(Local<Value> receiver,
@@ -1393,40 +1379,23 @@ static bool FastIsUtf8(Local<Value> receiver,
13931379
FastApiCallbackOptions& options) {
13941380
TRACK_V8_FAST_API_CALL("buffer.isUtf8");
13951381
HandleScope scope(options.isolate);
1396-
1397-
const ValidationResult result = ValidateUtf8(value);
1398-
if (result.was_detached) {
1399-
node::THROW_ERR_INVALID_STATE(options.isolate,
1400-
"Cannot validate on a detached buffer");
1401-
returnfalse;
1402-
}
1403-
return result.is_valid;
1382+
returnValidateUtf8(value);
14041383
}
14051384

14061385
static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
14071386

1408-
staticValidationResultValidateAscii(Local<Value> value) {
1387+
staticboolValidateAscii(Local<Value> value) {
14091388
ArrayBufferViewContents<char> abv(value);
1410-
bool was_detached = abv.WasDetached();
1411-
return {
1412-
!was_detached &&
1413-
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,
1414-
was_detached};
1389+
return abv.length() == 0 ||
1390+
!simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
14151391
}
14161392

14171393
staticvoidIsAscii(const FunctionCallbackInfo<Value>& args) {
1418-
Environment* env = Environment::GetCurrent(args);
14191394
CHECK_EQ(args.Length(), 1);
14201395
CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
14211396
args[0]->IsSharedArrayBuffer());
14221397

1423-
const ValidationResult result = ValidateAscii(args[0]);
1424-
if (result.was_detached) {
1425-
returnnode::THROW_ERR_INVALID_STATE(
1426-
env, "Cannot validate on a detached buffer");
1427-
}
1428-
1429-
args.GetReturnValue().Set(result.is_valid);
1398+
args.GetReturnValue().Set(ValidateAscii(args[0]));
14301399
}
14311400

14321401
staticboolFastIsAscii(Local<Value> receiver,
@@ -1435,14 +1404,7 @@ static bool FastIsAscii(Local<Value> receiver,
14351404
FastApiCallbackOptions& options) {
14361405
TRACK_V8_FAST_API_CALL("buffer.isAscii");
14371406
HandleScope scope(options.isolate);
1438-
1439-
const ValidationResult result = ValidateAscii(value);
1440-
if (result.was_detached) {
1441-
node::THROW_ERR_INVALID_STATE(options.isolate,
1442-
"Cannot validate on a detached buffer");
1443-
returnfalse;
1444-
}
1445-
return result.is_valid;
1407+
returnValidateAscii(value);
14461408
}
14471409

14481410
static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));

‎test/parallel/test-buffer-isascii.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);
3030
});
3131

3232
{
33-
// Test with detached array buffers
34-
constarrayBuffer=newArrayBuffer(1024);
33+
// Detached array buffers and views are treated as empty.
34+
constarrayBuffer=newArrayBuffer(1);
35+
consttypedArray=newUint8Array(arrayBuffer);
36+
typedArray[0]=0xff;
37+
constinputs=[
38+
arrayBuffer,
39+
typedArray,
40+
Buffer.from(arrayBuffer),
41+
];
42+
for(constinputofinputs){
43+
assert.strictEqual(isAscii(input),false);
44+
}
3545
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
36-
assert.throws(
37-
()=>{isAscii(arrayBuffer);},
38-
{
39-
code: 'ERR_INVALID_STATE'
40-
}
41-
);
46+
for(constinputofinputs){
47+
assert.strictEqual(isAscii(input),true);
48+
}
4249
}

‎test/parallel/test-buffer-isutf8.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);
7474
});
7575

7676
{
77-
// Test with detached array buffers
78-
constarrayBuffer=newArrayBuffer(1024);
77+
// Detached array buffers and views are treated as empty.
78+
constarrayBuffer=newArrayBuffer(1);
79+
consttypedArray=newUint8Array(arrayBuffer);
80+
typedArray[0]=0xff;
81+
constinputs=[
82+
arrayBuffer,
83+
typedArray,
84+
Buffer.from(arrayBuffer),
85+
];
86+
for(constinputofinputs){
87+
assert.strictEqual(isUtf8(input),false);
88+
}
7989
structuredClone(arrayBuffer,{transfer: [arrayBuffer]});
80-
assert.throws(
81-
()=>{isUtf8(arrayBuffer);},
82-
{
83-
code: 'ERR_INVALID_STATE'
84-
}
85-
);
90+
for(constinputofinputs){
91+
assert.strictEqual(isUtf8(input),true);
92+
}
8693
}

0 commit comments

Comments
 (0)