GeezerVison

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

GeezerVison is showing github.com — src: introduce internal buffer slice constructor · nodejs/node@4e807d6

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- node_buffer.cc
- node_internals.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/node_buffer.cc‎`

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

+19-29Lines changed: 19 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -303,15 +303,14 @@ MaybeLocal<Object> New(Environment* env, size_t length) {`
`303`	`303`	`data,`
`304`	`304`	`length,`
`305`	`305`	`ArrayBufferCreationMode::kInternalized);`
`306`		`- Local<Uint8Array> ui = Uint8Array::New(ab, 0, length);`
`307`		`- Maybe<bool> mb =`
`308`		`- ui->SetPrototype(env->context(), env->buffer_prototype_object());`
`309`		`- if (mb.FromMaybe(false))`
`310`		`- return scope.Escape(ui);`
	`306`	`+ MaybeLocal<Uint8Array> ui = Buffer::New(env, ab, 0, length);`
`311`	`307`
`312`		`- // Object failed to be created. Clean up resources.`
`313`		`- free(data);`
`314`		`- return Local<Object>();`
	`308`	`+ if (ui.IsEmpty()) {`
	`309`	`+ // Object failed to be created. Clean up resources.`
	`310`	`+ free(data);`
	`311`	`+ }`
	`312`	`+`
	`313`	`+ return scope.Escape(ui.FromMaybe(Local<Uint8Array>()));`
`315`	`314`	`}`
`316`	`315`
`317`	`316`
`@@ -349,15 +348,14 @@ MaybeLocal<Object> Copy(Environment* env, const char* data, size_t length) {`
`349`	`348`	`new_data,`
`350`	`349`	`length,`
`351`	`350`	`ArrayBufferCreationMode::kInternalized);`
`352`		`- Local<Uint8Array> ui = Uint8Array::New(ab, 0, length);`
`353`		`- Maybe<bool> mb =`
`354`		`- ui->SetPrototype(env->context(), env->buffer_prototype_object());`
`355`		`- if (mb.FromMaybe(false))`
`356`		`- return scope.Escape(ui);`
	`351`	`+ MaybeLocal<Uint8Array> ui = Buffer::New(env, ab, 0, length);`
`357`	`352`
`358`		`- // Object failed to be created. Clean up resources.`
`359`		`- free(new_data);`
`360`		`- return Local<Object>();`
	`353`	`+ if (ui.IsEmpty()) {`
	`354`	`+ // Object failed to be created. Clean up resources.`
	`355`	`+ free(new_data);`
	`356`	`+ }`
	`357`	`+`
	`358`	`+ return scope.Escape(ui.FromMaybe(Local<Uint8Array>()));`
`361`	`359`	`}`
`362`	`360`
`363`	`361`
`@@ -392,15 +390,14 @@ MaybeLocal<Object> New(Environment* env,`
`392`	`390`	`// correct.`
`393`	`391`	`if (data == nullptr)`
`394`	`392`	`ab->Neuter();`
`395`		`- Local<Uint8Array> ui = Uint8Array::New(ab, 0, length);`
`396`		`- Maybe<bool> mb =`
`397`		`- ui->SetPrototype(env->context(), env->buffer_prototype_object());`
	`393`	`+ MaybeLocal<Uint8Array> ui = Buffer::New(env, ab, 0, length);`
`398`	`394`
`399`		`- if (!mb.FromMaybe(false))`
	`395`	`+ if (ui.IsEmpty()) {`
`400`	`396`	`return Local<Object>();`
	`397`	`+ }`
`401`	`398`
`402`	`399`	`CallbackInfo::New(env->isolate(), ab, callback, data, hint);`
`403`		`- return scope.Escape(ui);`
	`400`	`+ return scope.Escape(ui.ToLocalChecked());`
`404`	`401`	`}`
`405`	`402`
`406`	`403`
`@@ -415,8 +412,6 @@ MaybeLocal<Object> New(Isolate* isolate, char* data, size_t length) {`
`415`	`412`
`416`	`413`
`417`	`414`	`MaybeLocal<Object> New(Environment* env, char* data, size_t length) {`
`418`		`- EscapableHandleScope scope(env->isolate());`
`419`		`-`
`420`	`415`	`if (length > 0) {`
`421`	`416`	`CHECK_NE(data, nullptr);`
`422`	`417`	`CHECK(length <= kMaxLength);`
`@@ -427,12 +422,7 @@ MaybeLocal<Object> New(Environment* env, char* data, size_t length) {`
`427`	`422`	`data,`
`428`	`423`	`length,`
`429`	`424`	`ArrayBufferCreationMode::kInternalized);`
`430`		`- Local<Uint8Array> ui = Uint8Array::New(ab, 0, length);`
`431`		`- Maybe<bool> mb =`
`432`		`- ui->SetPrototype(env->context(), env->buffer_prototype_object());`
`433`		`- if (mb.FromMaybe(false))`
`434`		`- return scope.Escape(ui);`
`435`		`- return Local<Object>();`
	`425`	`+ return Buffer::New(env, ab, 0, length).FromMaybe(Local<Object>());`
`436`	`426`	`}`
`437`	`427`
`438`	`428`	`namespace {`

Collapse file

`‎src/node_internals.h‎`

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

+13Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,19 @@ v8::MaybeLocal<v8::Object> New(Environment* env,`
`330`	`330`	`// Mixing operator new and free() is undefined behavior so don't do that.`
`331`	`331`	`v8::MaybeLocal<v8::Object> New(Environment* env, char* data, size_t length);`
`332`	`332`
	`333`	`+inline`
	`334`	`+v8::MaybeLocal<v8::Uint8Array> New(Environment* env,`
	`335`	`+ v8::Local<v8::ArrayBuffer> ab,`
	`336`	`+ size_t byte_offset,`
	`337`	`+ size_t length) {`
	`338`	`+ v8::Local<v8::Uint8Array> ui = v8::Uint8Array::New(ab, byte_offset, length);`
	`339`	`+ v8::Maybe<bool> mb =`
	`340`	`+ ui->SetPrototype(env->context(), env->buffer_prototype_object());`
	`341`	`+ if (mb.IsNothing())`
	`342`	`+ return v8::MaybeLocal<v8::Uint8Array>();`
	`343`	`+ return ui;`
	`344`	`+}`
	`345`	`+`
`333`	`346`	`// Construct a Buffer from a MaybeStackBuffer (and also its subclasses like`
`334`	`347`	`// Utf8Value and TwoByteValue).`
`335`	`348`	`// If \|buf\| is invalidated, an empty MaybeLocal is returned, and nothing is`

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.