Merge pull request #6719 from murgatroid99/node_compressed_read_fix

Make Node not segfault when it receives a compressed message
pull/6667/head
Jan Tattermusch 9 years ago
commit be0456c57b
  1. 14
      src/node/ext/byte_buffer.cc

@ -72,17 +72,13 @@ Local<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
if (buffer == NULL) { if (buffer == NULL) {
return scope.Escape(Nan::Null()); return scope.Escape(Nan::Null());
} }
size_t length = grpc_byte_buffer_length(buffer);
char *result = new char[length];
size_t offset = 0;
grpc_byte_buffer_reader reader; grpc_byte_buffer_reader reader;
grpc_byte_buffer_reader_init(&reader, buffer); grpc_byte_buffer_reader_init(&reader, buffer);
gpr_slice next; gpr_slice slice = grpc_byte_buffer_reader_readall(&reader);
while (grpc_byte_buffer_reader_next(&reader, &next) != 0) { size_t length = GPR_SLICE_LENGTH(slice);
memcpy(result + offset, GPR_SLICE_START_PTR(next), GPR_SLICE_LENGTH(next)); char *result = new char[length];
offset += GPR_SLICE_LENGTH(next); memcpy(result, GPR_SLICE_START_PTR(slice), length);
gpr_slice_unref(next); gpr_slice_unref(slice);
}
return scope.Escape(MakeFastBuffer( return scope.Escape(MakeFastBuffer(
Nan::NewBuffer(result, length, delete_buffer, NULL).ToLocalChecked())); Nan::NewBuffer(result, length, delete_buffer, NULL).ToLocalChecked()));
} }

Loading…
Cancel
Save