aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2016-02-10 14:28:26 -0800
committerGravatar Michael Lumish <mlumish@google.com>2016-02-10 14:28:26 -0800
commit82e7effaff41a1ab5b22fa21ad52bccda62eb238 (patch)
tree2d2de5ce48c99b516a23f7e1c00ddead55c44f40
parent42fad8e765b8bbdd2211dc2e0172a9565d395cc8 (diff)
parent777777efa4e23668dd5b23ed85e94d66c3f17af2 (diff)
Merge pull request #5185 from lepatryk/byte-buffer
Pass delete[] explicitely to Nan::NewBuffer.
-rw-r--r--src/node/ext/byte_buffer.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/node/ext/byte_buffer.cc b/src/node/ext/byte_buffer.cc
index ee703fdc91..0f7edada14 100644
--- a/src/node/ext/byte_buffer.cc
+++ b/src/node/ext/byte_buffer.cc
@@ -63,6 +63,10 @@ grpc_byte_buffer *BufferToByteBuffer(Local<Value> buffer) {
return byte_buffer;
}
+namespace {
+void delete_buffer(char *data, void *hint) { delete[] data; }
+}
+
Local<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
Nan::EscapableHandleScope scope;
if (buffer == NULL) {
@@ -80,7 +84,7 @@ Local<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
gpr_slice_unref(next);
}
return scope.Escape(MakeFastBuffer(
- Nan::NewBuffer(result, length).ToLocalChecked()));
+ Nan::NewBuffer(result, length, delete_buffer, NULL).ToLocalChecked()));
}
Local<Value> MakeFastBuffer(Local<Value> slowBuffer) {