aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/node/ext/byte_buffer.cc
diff options
context:
space:
mode:
authorGravatar murgatroid99 <mlumish@google.com>2016-07-08 09:29:42 -0700
committerGravatar murgatroid99 <mlumish@google.com>2016-07-08 09:29:42 -0700
commit19787c75289a7891d594804ffee63313d6541efa (patch)
tree3be298b4751976b24699617a9a1032de633e9849 /src/node/ext/byte_buffer.cc
parentae466c8a8d5586b08ef5078febc115775220b8b9 (diff)
parentc28a6c1b3b4d68da7661997cd56d305b254a7d0b (diff)
Merge branch 'master' into ruby_api_review_changes
Diffstat (limited to 'src/node/ext/byte_buffer.cc')
-rw-r--r--src/node/ext/byte_buffer.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/node/ext/byte_buffer.cc b/src/node/ext/byte_buffer.cc
index 3479a67702..a3f678f32c 100644
--- a/src/node/ext/byte_buffer.cc
+++ b/src/node/ext/byte_buffer.cc
@@ -73,7 +73,10 @@ Local<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
return scope.Escape(Nan::Null());
}
grpc_byte_buffer_reader reader;
- grpc_byte_buffer_reader_init(&reader, buffer);
+ if (!grpc_byte_buffer_reader_init(&reader, buffer)) {
+ Nan::ThrowError("Error initializing byte buffer reader.");
+ return scope.Escape(Nan::Undefined());
+ }
gpr_slice slice = grpc_byte_buffer_reader_readall(&reader);
size_t length = GPR_SLICE_LENGTH(slice);
char *result = new char[length];