Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/node_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,11 @@ MaybeLocal<Object> New(Environment* env,
}

Local<ArrayBuffer> 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<Uint8Array> ui = Uint8Array::New(ab, 0, length);
Maybe<bool> mb =
ui->SetPrototype(env->context(), env->buffer_prototype_object());
Expand Down
40 changes: 40 additions & 0 deletions test/addons/null-buffer-neuter/binding.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#include <node.h>
#include <node_buffer.h>
#include <util.h>
#include <v8.h>

static int alive;

static void FreeCallback(char* data, void* hint) {
CHECK_EQ(data, nullptr);
alive--;
}

void Run(const v8::FunctionCallbackInfo<v8::Value>& args) {
v8::Isolate* isolate = args.GetIsolate();
alive++;

{
v8::HandleScope scope(isolate);
v8::Local<v8::Object> 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<v8::Object> target) {
NODE_SET_METHOD(target, "run", Run);
}

NODE_MODULE(binding, init);
8 changes: 8 additions & 0 deletions test/addons/null-buffer-neuter/binding.gyp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
'targets': [
{
'target_name': 'binding',
'sources': [ 'binding.cc' ]
}
]
}
7 changes: 7 additions & 0 deletions test/addons/null-buffer-neuter/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use strict';
// Flags: --expose-gc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this flag necessary here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Without it, v8::Isolate::RequestGarbageCollectionForTesting() aborts with a run-time error.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok, didn't realize that


require('../../common');
var binding = require('./build/Release/binding');

binding.run();