diff --git a/src/node_buffer.cc b/src/node_buffer.cc index 7d428b2b13..e4af4909ff 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -362,6 +362,11 @@ MaybeLocal New(Environment* env, } Local ab = ArrayBuffer::New(env->isolate(), data, length); + // `Neuter()`ing is required here to prevent materialization of the backing + // store in v8. `nullptr` buffers are not writable, so this is semantically + // correct. + if (data == nullptr) + ab->Neuter(); Local ui = Uint8Array::New(ab, 0, length); Maybe mb = ui->SetPrototype(env->context(), env->buffer_prototype_object()); diff --git a/test/addons/null-buffer-neuter/binding.cc b/test/addons/null-buffer-neuter/binding.cc new file mode 100644 index 0000000000..da75919011 --- /dev/null +++ b/test/addons/null-buffer-neuter/binding.cc @@ -0,0 +1,40 @@ +#include +#include +#include +#include + +static int alive; + +static void FreeCallback(char* data, void* hint) { + CHECK_EQ(data, nullptr); + alive--; +} + +void Run(const v8::FunctionCallbackInfo& args) { + v8::Isolate* isolate = args.GetIsolate(); + alive++; + + { + v8::HandleScope scope(isolate); + v8::Local buf = node::Buffer::New( + isolate, + nullptr, + 0, + FreeCallback, + nullptr).ToLocalChecked(); + + char* data = node::Buffer::Data(buf); + CHECK_EQ(data, nullptr); + } + + isolate->RequestGarbageCollectionForTesting( + v8::Isolate::kFullGarbageCollection); + + CHECK_EQ(alive, 0); +} + +void init(v8::Local target) { + NODE_SET_METHOD(target, "run", Run); +} + +NODE_MODULE(binding, init); diff --git a/test/addons/null-buffer-neuter/binding.gyp b/test/addons/null-buffer-neuter/binding.gyp new file mode 100644 index 0000000000..3bfb84493f --- /dev/null +++ b/test/addons/null-buffer-neuter/binding.gyp @@ -0,0 +1,8 @@ +{ + 'targets': [ + { + 'target_name': 'binding', + 'sources': [ 'binding.cc' ] + } + ] +} diff --git a/test/addons/null-buffer-neuter/test.js b/test/addons/null-buffer-neuter/test.js new file mode 100644 index 0000000000..bca76e27af --- /dev/null +++ b/test/addons/null-buffer-neuter/test.js @@ -0,0 +1,7 @@ +'use strict'; +// Flags: --expose-gc + +require('../../common'); +var binding = require('./build/Release/binding'); + +binding.run();