...

src/node_buffer.cc

@@ -152,7 +152,8 @@ void CallbackInfo::WeakCallback(Isolate* isolate, Local<Object> object) {
   Local<ArrayBuffer> buf = object.As<ArrayBuffer>();
   ArrayBuffer::Contents obj_c = buf->GetContents();
   char* const obj_data = static_cast<char*>(obj_c.Data());
-  CHECK_NE(obj_data, nullptr);
+  if (buf->ByteLength() != 0)
+    CHECK_NE(obj_data, nullptr);
 
   buf->Neuter();
   callback_(obj_data, hint_);

test/addons/buffer-free-callback/binding.cc

@@ -16,7 +16,7 @@ void Alloc(const v8::FunctionCallbackInfo<v8::Value>& args) {
   args.GetReturnValue().Set(node::Buffer::New(
         isolate,
         buf,
-        sizeof(buf),
+        args[0]->IntegerValue(),
         FreeCallback,
         nullptr).ToLocalChecked());
 }

test/addons/buffer-free-callback/test.js

@@ -4,11 +4,20 @@
 require('../../common');
 var assert = require('assert');
 var binding = require('./build/Release/binding');
-var buf = binding.alloc();
-var slice = buf.slice(32);
-buf = null;
-binding.check(slice);
-slice = null;
-gc();
-gc();
-gc();
+
+function check(size) {
+  var buf = binding.alloc(size);
+  var slice = buf.slice(size >>> 1);
+
+  buf = null;
+  binding.check(slice);
+  slice = null;
+  gc();
+  gc();
+  gc();
+}
+
+check(64);
+
+// Empty ArrayBuffer does not allocate data, worth checking
+check(0);