GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — buffer: treat detached ArrayBuffers as empty · nodejs/node@cc9ee6c

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

doc/api
- buffer.md
src
- node_buffer.cc
test/parallel
- test-buffer-isascii.js
- test-buffer-isutf8.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎doc/api/buffer.md‎`

Copy file name to clipboardExpand all lines: doc/api/buffer.md

+12-2Lines changed: 12 additions & 2 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -5303,6 +5303,11 @@ npx codemod@latest @nodejs/buffer-atob-btoa`
`5303`	`5303`	`added:`
`5304`	`5304`	`- v19.6.0`
`5305`	`5305`	`- v18.15.0`
	`5306`	`+changes:`
	`5307`	`+ - version: REPLACEME`
	`5308`	`+ pr-url: https://github.com/nodejs/node/pull/64504`
	`5309`	+ description: Detached `ArrayBuffer`s and views backed by them are treated
	`5310`	`+ as empty.`
`5306`	`5311`	`-->`
`5307`	`5312`
`5308`	`5313`	* `input` {Buffer \| ArrayBuffer \| TypedArray} The input to validate.
`@@ -5311,14 +5316,19 @@ added:`
`5311`	`5316`	This function returns `true` if `input` contains only valid ASCII-encoded data,
`5312`	`5317`	including the case in which `input` is empty.
`5313`	`5318`
`5314`		-Throws if the `input` is a detached array buffer.
	`5319`	+A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
`5315`	`5320`
`5316`	`5321`	### `buffer.isUtf8(input)`
`5317`	`5322`
`5318`	`5323`	`<!-- YAML`
`5319`	`5324`	`added:`
`5320`	`5325`	`- v19.4.0`
`5321`	`5326`	`- v18.14.0`
	`5327`	`+changes:`
	`5328`	`+ - version: REPLACEME`
	`5329`	`+ pr-url: https://github.com/nodejs/node/pull/64504`
	`5330`	+ description: Detached `ArrayBuffer`s and views backed by them are treated
	`5331`	`+ as empty.`
`5322`	`5332`	`-->`
`5323`	`5333`
`5324`	`5334`	* `input` {Buffer \| ArrayBuffer \| TypedArray} The input to validate.
`@@ -5327,7 +5337,7 @@ added:`
`5327`	`5337`	This function returns `true` if `input` contains only valid UTF-8-encoded data,
`5328`	`5338`	including the case in which `input` is empty.
`5329`	`5339`
`5330`		-Throws if the `input` is a detached array buffer.
	`5340`	+A detached `ArrayBuffer`, or a `TypedArray` backed by one, is treated as empty.
`5331`	`5341`
`5332`	`5342`	### `buffer.INSPECT_MAX_BYTES`
`5333`	`5343`

Collapse file

`‎src/node_buffer.cc‎`

Copy file name to clipboardExpand all lines: src/node_buffer.cc

+9-47Lines changed: 9 additions & 47 deletions

Original file line number	Diff line number	Diff line change
`@@ -1302,31 +1302,17 @@ void FastSwap64(Local<Value> receiver,`
`1302`	`1302`
`1303`	`1303`	`static CFunction fast_swap64(CFunction::Make(FastSwap64));`
`1304`	`1304`
`1305`		`-struct ValidationResult {`
`1306`		`- bool is_valid;`
`1307`		`- bool was_detached;`
`1308`		`-};`
`1309`		`-`
`1310`		`-static ValidationResult ValidateUtf8(Local<Value> value) {`
	`1305`	`+static bool ValidateUtf8(Local<Value> value) {`
`1311`	`1306`	`ArrayBufferViewContents<char> abv(value);`
`1312`		`- bool was_detached = abv.WasDetached();`
`1313`		`- return {!was_detached && simdutf::validate_utf8(abv.data(), abv.length()),`
`1314`		`- was_detached};`
	`1307`	`+ return abv.length() == 0 \|\| simdutf::validate_utf8(abv.data(), abv.length());`
`1315`	`1308`	`}`
`1316`	`1309`
`1317`	`1310`	`static void IsUtf8(const FunctionCallbackInfo<Value>& args) {`
`1318`		`- Environment* env = Environment::GetCurrent(args);`
`1319`	`1311`	`CHECK_EQ(args.Length(), 1);`
`1320`	`1312`	`CHECK(args[0]->IsTypedArray() \|\| args[0]->IsArrayBuffer() \|\|`
`1321`	`1313`	`args[0]->IsSharedArrayBuffer());`
`1322`	`1314`
`1323`		`- const ValidationResult result = ValidateUtf8(args[0]);`
`1324`		`- if (result.was_detached) {`
`1325`		`- return node::THROW_ERR_INVALID_STATE(`
`1326`		`- env, "Cannot validate on a detached buffer");`
`1327`		`- }`
`1328`		`-`
`1329`		`- args.GetReturnValue().Set(result.is_valid);`
	`1315`	`+ args.GetReturnValue().Set(ValidateUtf8(args[0]));`
`1330`	`1316`	`}`
`1331`	`1317`
`1332`	`1318`	`static bool FastIsUtf8(Local<Value> receiver,`
`@@ -1335,40 +1321,23 @@ static bool FastIsUtf8(Local<Value> receiver,`
`1335`	`1321`	`FastApiCallbackOptions& options) {`
`1336`	`1322`	`TRACK_V8_FAST_API_CALL("buffer.isUtf8");`
`1337`	`1323`	`HandleScope scope(options.isolate);`
`1338`		`-`
`1339`		`- const ValidationResult result = ValidateUtf8(value);`
`1340`		`- if (result.was_detached) {`
`1341`		`- node::THROW_ERR_INVALID_STATE(options.isolate,`
`1342`		`- "Cannot validate on a detached buffer");`
`1343`		`- return false;`
`1344`		`- }`
`1345`		`- return result.is_valid;`
	`1324`	`+ return ValidateUtf8(value);`
`1346`	`1325`	`}`
`1347`	`1326`
`1348`	`1327`	`static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));`
`1349`	`1328`
`1350`		`-static ValidationResult ValidateAscii(Local<Value> value) {`
	`1329`	`+static bool ValidateAscii(Local<Value> value) {`
`1351`	`1330`	`ArrayBufferViewContents<char> abv(value);`
`1352`		`- bool was_detached = abv.WasDetached();`
`1353`		`- return {`
`1354`		`- !was_detached &&`
`1355`		`- !simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error,`
`1356`		`- was_detached};`
	`1331`	`+ return abv.length() == 0 \|\|`
	`1332`	`+ !simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;`
`1357`	`1333`	`}`
`1358`	`1334`
`1359`	`1335`	`static void IsAscii(const FunctionCallbackInfo<Value>& args) {`
`1360`		`- Environment* env = Environment::GetCurrent(args);`
`1361`	`1336`	`CHECK_EQ(args.Length(), 1);`
`1362`	`1337`	`CHECK(args[0]->IsTypedArray() \|\| args[0]->IsArrayBuffer() \|\|`
`1363`	`1338`	`args[0]->IsSharedArrayBuffer());`
`1364`	`1339`
`1365`		`- const ValidationResult result = ValidateAscii(args[0]);`
`1366`		`- if (result.was_detached) {`
`1367`		`- return node::THROW_ERR_INVALID_STATE(`
`1368`		`- env, "Cannot validate on a detached buffer");`
`1369`		`- }`
`1370`		`-`
`1371`		`- args.GetReturnValue().Set(result.is_valid);`
	`1340`	`+ args.GetReturnValue().Set(ValidateAscii(args[0]));`
`1372`	`1341`	`}`
`1373`	`1342`
`1374`	`1343`	`static bool FastIsAscii(Local<Value> receiver,`
`@@ -1377,14 +1346,7 @@ static bool FastIsAscii(Local<Value> receiver,`
`1377`	`1346`	`FastApiCallbackOptions& options) {`
`1378`	`1347`	`TRACK_V8_FAST_API_CALL("buffer.isAscii");`
`1379`	`1348`	`HandleScope scope(options.isolate);`
`1380`		`-`
`1381`		`- const ValidationResult result = ValidateAscii(value);`
`1382`		`- if (result.was_detached) {`
`1383`		`- node::THROW_ERR_INVALID_STATE(options.isolate,`
`1384`		`- "Cannot validate on a detached buffer");`
`1385`		`- return false;`
`1386`		`- }`
`1387`		`- return result.is_valid;`
	`1349`	`+ return ValidateAscii(value);`
`1388`	`1350`	`}`
`1389`	`1351`
`1390`	`1352`	`static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));`

Collapse file

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

Copy file name to clipboardExpand all lines: test/parallel/test-buffer-isascii.js

+15-8Lines changed: 15 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,20 @@ assert.strictEqual(isAscii(Buffer.from([])), true);`
`30`	`30`	`});`
`31`	`31`
`32`	`32`	`{`
`33`		`- // Test with detached array buffers`
`34`		`- const arrayBuffer = new ArrayBuffer(1024);`
	`33`	`+ // Detached array buffers and views are treated as empty.`
	`34`	`+ const arrayBuffer = new ArrayBuffer(1);`
	`35`	`+ const typedArray = new Uint8Array(arrayBuffer);`
	`36`	`+ typedArray[0] = 0xff;`
	`37`	`+ const inputs = [`
	`38`	`+ arrayBuffer,`
	`39`	`+ typedArray,`
	`40`	`+ Buffer.from(arrayBuffer),`
	`41`	`+ ];`
	`42`	`+ for (const input of inputs) {`
	`43`	`+ assert.strictEqual(isAscii(input), false);`
	`44`	`+ }`
`35`	`45`	`structuredClone(arrayBuffer, { transfer: [arrayBuffer] });`
`36`		`- assert.throws(`
`37`		`- () => { isAscii(arrayBuffer); },`
`38`		`- {`
`39`		`- code: 'ERR_INVALID_STATE'`
`40`		`- }`
`41`		`- );`
	`46`	`+ for (const input of inputs) {`
	`47`	`+ assert.strictEqual(isAscii(input), true);`
	`48`	`+ }`
`42`	`49`	`}`

Collapse file

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

Copy file name to clipboardExpand all lines: test/parallel/test-buffer-isutf8.js

+15-8Lines changed: 15 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,13 +74,20 @@ assert.strictEqual(isUtf8(Buffer.from([])), true);`
`74`	`74`	`});`
`75`	`75`
`76`	`76`	`{`
`77`		`- // Test with detached array buffers`
`78`		`- const arrayBuffer = new ArrayBuffer(1024);`
	`77`	`+ // Detached array buffers and views are treated as empty.`
	`78`	`+ const arrayBuffer = new ArrayBuffer(1);`
	`79`	`+ const typedArray = new Uint8Array(arrayBuffer);`
	`80`	`+ typedArray[0] = 0xff;`
	`81`	`+ const inputs = [`
	`82`	`+ arrayBuffer,`
	`83`	`+ typedArray,`
	`84`	`+ Buffer.from(arrayBuffer),`
	`85`	`+ ];`
	`86`	`+ for (const input of inputs) {`
	`87`	`+ assert.strictEqual(isUtf8(input), false);`
	`88`	`+ }`
`79`	`89`	`structuredClone(arrayBuffer, { transfer: [arrayBuffer] });`
`80`		`- assert.throws(`
`81`		`- () => { isUtf8(arrayBuffer); },`
`82`		`- {`
`83`		`- code: 'ERR_INVALID_STATE'`
`84`		`- }`
`85`		`- );`
	`90`	`+ for (const input of inputs) {`
	`91`	`+ assert.strictEqual(isUtf8(input), true);`
	`92`	`+ }`
`86`	`93`	`}`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.