GeezerVison

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

GeezerVison is showing github.com — src: throw RangeError on failed ArrayBuffer BackingStore allocation · nodejs/node@da13186

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/encoding_binding.cc‎`

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

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

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ namespace encoding_binding {`
`15`	`15`	`using v8::ArrayBuffer;`
`16`	`16`	`using v8::BackingStore;`
`17`	`17`	`using v8::BackingStoreInitializationMode;`
	`18`	`+using v8::BackingStoreOnFailureMode;`
`18`	`19`	`using v8::Context;`
`19`	`20`	`using v8::FunctionCallbackInfo;`
`20`	`21`	`using v8::HandleScope;`
`@@ -124,9 +125,15 @@ void BindingData::EncodeUtf8String(const FunctionCallbackInfo<Value>& args) {`
`124`	`125`	`Local<ArrayBuffer> ab;`
`125`	`126`	`{`
`126`	`127`	`std::unique_ptr<BackingStore> bs = ArrayBuffer::NewBackingStore(`
`127`		`- isolate, length, BackingStoreInitializationMode::kUninitialized);`
	`128`	`+ isolate,`
	`129`	`+ length,`
	`130`	`+ BackingStoreInitializationMode::kUninitialized,`
	`131`	`+ BackingStoreOnFailureMode::kReturnNull);`
`128`	`132`
`129`		`- CHECK(bs);`
	`133`	`+ if (!bs) [[unlikely]] {`
	`134`	`+ THROW_ERR_MEMORY_ALLOCATION_FAILED(isolate);`
	`135`	`+ return;`
	`136`	`+ }`
`130`	`137`
`131`	`138`	// We are certain that `data` is sufficiently large
`132`	`139`	`str->WriteUtf8V2(isolate,`

Collapse file

`‎src/node_blob.cc‎`

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

+9-1Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ using v8::ArrayBuffer;`
`22`	`22`	`using v8::ArrayBufferView;`
`23`	`23`	`using v8::BackingStore;`
`24`	`24`	`using v8::BackingStoreInitializationMode;`
	`25`	`+using v8::BackingStoreOnFailureMode;`
`25`	`26`	`using v8::Context;`
`26`	`27`	`using v8::Function;`
`27`	`28`	`using v8::FunctionCallbackInfo;`
`@@ -83,7 +84,14 @@ void Concat(const FunctionCallbackInfo<Value>& args) {`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`std::shared_ptr<BackingStore> store = ArrayBuffer::NewBackingStore(`
`86`		`- isolate, total, BackingStoreInitializationMode::kUninitialized);`
	`87`	`+ isolate,`
	`88`	`+ total,`
	`89`	`+ BackingStoreInitializationMode::kUninitialized,`
	`90`	`+ BackingStoreOnFailureMode::kReturnNull);`
	`91`	`+ if (!store) [[unlikely]] {`
	`92`	`+ THROW_ERR_MEMORY_ALLOCATION_FAILED(isolate);`
	`93`	`+ return;`
	`94`	`+ }`
`87`	`95`	`uint8_t* ptr = static_cast<uint8_t*>(store->Data());`
`88`	`96`	`for (size_t n = 0; n < views.size(); n++) {`
`89`	`97`	`uint8_t* from =`

Collapse file

`‎src/node_buffer.cc‎`

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

+34-11Lines changed: 34 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ using v8::ArrayBuffer;`
`59`	`59`	`using v8::ArrayBufferView;`
`60`	`60`	`using v8::BackingStore;`
`61`	`61`	`using v8::BackingStoreInitializationMode;`
	`62`	`+using v8::BackingStoreOnFailureMode;`
`62`	`63`	`using v8::CFunction;`
`63`	`64`	`using v8::Context;`
`64`	`65`	`using v8::EscapableHandleScope;`
`@@ -304,17 +305,20 @@ MaybeLocal<Object> New(Isolate* isolate,`
`304`	`305`	`EscapableHandleScope scope(isolate);`
`305`	`306`
`306`	`307`	`size_t length;`
`307`		`- if (!StringBytes::Size(isolate, string, enc).To(&length))`
`308`		`- return Local<Object>();`
	`308`	`+ if (!StringBytes::Size(isolate, string, enc).To(&length)) return {};`
`309`	`309`	`size_t actual = 0;`
`310`	`310`	`std::unique_ptr<BackingStore> store;`
`311`	`311`
`312`	`312`	`if (length > 0) {`
`313`		`- store = ArrayBuffer::NewBackingStore(isolate, length);`
	`313`	`+ store = ArrayBuffer::NewBackingStore(`
	`314`	`+ isolate,`
	`315`	`+ length,`
	`316`	`+ BackingStoreInitializationMode::kZeroInitialized,`
	`317`	`+ BackingStoreOnFailureMode::kReturnNull);`
`314`	`318`
`315`	`319`	`if (!store) [[unlikely]] {`
`316`	`320`	`THROW_ERR_MEMORY_ALLOCATION_FAILED(isolate);`
`317`		`- return Local<Object>();`
	`321`	`+ return {};`
`318`	`322`	`}`
`319`	`323`
`320`	`324`	`actual = StringBytes::Write(`
`@@ -329,7 +333,14 @@ MaybeLocal<Object> New(Isolate* isolate,`
`329`	`333`	`if (actual < length) {`
`330`	`334`	`std::unique_ptr<BackingStore> old_store = std::move(store);`
`331`	`335`	`store = ArrayBuffer::NewBackingStore(`
`332`		`- isolate, actual, BackingStoreInitializationMode::kUninitialized);`
	`336`	`+ isolate,`
	`337`	`+ actual,`
	`338`	`+ BackingStoreInitializationMode::kUninitialized,`
	`339`	`+ BackingStoreOnFailureMode::kReturnNull);`
	`340`	`+ if (!store) [[unlikely]] {`
	`341`	`+ THROW_ERR_MEMORY_ALLOCATION_FAILED(isolate);`
	`342`	`+ return {};`
	`343`	`+ }`
`333`	`344`	`memcpy(store->Data(), old_store->Data(), actual);`
`334`	`345`	`}`
`335`	`346`	`Local<ArrayBuffer> buf = ArrayBuffer::New(isolate, std::move(store));`
`@@ -372,7 +383,14 @@ MaybeLocal<Object> New(Environment* env, size_t length) {`
`372`	`383`	`Local<ArrayBuffer> ab;`
`373`	`384`	`{`
`374`	`385`	`std::unique_ptr<BackingStore> bs = ArrayBuffer::NewBackingStore(`
`375`		`- isolate, length, BackingStoreInitializationMode::kUninitialized);`
	`386`	`+ isolate,`
	`387`	`+ length,`
	`388`	`+ BackingStoreInitializationMode::kUninitialized,`
	`389`	`+ BackingStoreOnFailureMode::kReturnNull);`
	`390`	`+ if (!bs) [[unlikely]] {`
	`391`	`+ THROW_ERR_MEMORY_ALLOCATION_FAILED(isolate);`
	`392`	`+ return {};`
	`393`	`+ }`
`376`	`394`
`377`	`395`	`CHECK(bs);`
`378`	`396`
`@@ -412,9 +430,14 @@ MaybeLocal<Object> Copy(Environment* env, const char* data, size_t length) {`
`412`	`430`	`}`
`413`	`431`
`414`	`432`	`std::unique_ptr<BackingStore> bs = ArrayBuffer::NewBackingStore(`
`415`		`- isolate, length, BackingStoreInitializationMode::kUninitialized);`
`416`		`-`
`417`		`- CHECK(bs);`
	`433`	`+ isolate,`
	`434`	`+ length,`
	`435`	`+ BackingStoreInitializationMode::kUninitialized,`
	`436`	`+ BackingStoreOnFailureMode::kReturnNull);`
	`437`	`+ if (!bs) [[unlikely]] {`
	`438`	`+ THROW_ERR_MEMORY_ALLOCATION_FAILED(isolate);`
	`439`	`+ return {};`
	`440`	`+ }`
`418`	`441`
`419`	`442`	`if (length > 0) memcpy(bs->Data(), data, length);`
`420`	`443`
`@@ -1449,8 +1472,8 @@ void CreateUnsafeArrayBuffer(const FunctionCallbackInfo<Value>& args) {`
`1449`	`1472`	`BackingStoreInitializationMode::kUninitialized,`
`1450`	`1473`	`v8::BackingStoreOnFailureMode::kReturnNull);`
`1451`	`1474`
`1452`		`- if (!store) {`
`1453`		`- env->ThrowRangeError("Array buffer allocation failed");`
	`1475`	`+ if (!store) [[unlikely]] {`
	`1476`	`+ THROW_ERR_MEMORY_ALLOCATION_FAILED(env);`
`1454`	`1477`	`return;`
`1455`	`1478`	`}`
`1456`	`1479`

Collapse file

`‎src/node_errors.h‎`

Copy file name to clipboardExpand all lines: src/node_errors.h

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ void OOMErrorHandler(const char* location, const v8::OOMDetails& details);`
`106`	`106`	`V(ERR_INVALID_URL_PATTERN, TypeError) \`
`107`	`107`	`V(ERR_INVALID_URL_SCHEME, TypeError) \`
`108`	`108`	`V(ERR_LOAD_SQLITE_EXTENSION, Error) \`
`109`		`- V(ERR_MEMORY_ALLOCATION_FAILED, Error) \`
	`109`	`+ V(ERR_MEMORY_ALLOCATION_FAILED, RangeError) \`
`110`	`110`	`V(ERR_MESSAGE_TARGET_CONTEXT_UNAVAILABLE, Error) \`
`111`	`111`	`V(ERR_MISSING_ARGS, TypeError) \`
`112`	`112`	`V(ERR_MISSING_PASSPHRASE, TypeError) \`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — 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.