nodejs
diff --git a/‎src/node_buffer.cc‎
Lines changed: 14 additions & 2 deletions b/‎src/node_buffer.cc‎
Lines changed: 14 additions & 2 deletions
diff --git a/‎test/parallel/test-v8-serialize-leak.js‎
Lines changed: 22 additions & 0 deletions b/‎test/parallel/test-v8-serialize-leak.js‎
Lines changed: 22 additions & 0 deletions
@@ -502,8 +502,20 @@ MaybeLocal<Object> New(Environment* env,
     }
   }
 
-  auto free_callback = [](char* data, void* hint) { free(data); };
-  return New(env, data, length, free_callback, nullptr);
+  EscapableHandleScope handle_scope(env->isolate());
+
+  auto free_callback = [](void* data, size_t length, void* deleter_data) {
+    free(data);
+  };
+  std::unique_ptr<BackingStore> bs =
+      v8::ArrayBuffer::NewBackingStore(data, length, free_callback, nullptr);
+
+  Local<ArrayBuffer> ab = v8::ArrayBuffer::New(env->isolate(), std::move(bs));
+
+  Local<Object> obj;
+  if (Buffer::New(env, ab, 0, length).ToLocal(&obj))
+    return handle_scope.Escape(obj);
+  return Local<Object>();
 }
 
 namespace {
 
@@ -0,0 +1,22 @@
+'use strict';
+// Flags: --expose-gc
+
+require('../common');
+const v8 = require('v8');
+const assert = require('assert');
+
+const before = process.memoryUsage.rss();
+
+for (let i = 0; i < 1000000; i++) {
+  v8.serialize('');
+}
+
+global.gc();
+
+const after = process.memoryUsage.rss();
+
+if (process.config.variables.asan) {
+  assert(after < before * 10, `asan: before=${before} after=${after}`);
+} else {
+  assert(after < before * 2, `before=${before} after=${after}`);
+}