Merge branch 'master' of https://github.com/grpc/grpc into update_ssl_cert

This commit is contained in:
Julien Boeuf 2015-11-17 18:53:55 -08:00
commit 0199209ec9
1 changed files with 1 additions and 1 deletions

View File

@ -82,7 +82,7 @@ bool ParseChannelArgs(Local<Value> args_val,
return false; return false;
} }
grpc_channel_args *channel_args = reinterpret_cast<grpc_channel_args*>( grpc_channel_args *channel_args = reinterpret_cast<grpc_channel_args*>(
malloc(sizeof(channel_args))); malloc(sizeof(grpc_channel_args)));
*channel_args_ptr = channel_args; *channel_args_ptr = channel_args;
Local<Object> args_hash = Nan::To<Object>(args_val).ToLocalChecked(); Local<Object> args_hash = Nan::To<Object>(args_val).ToLocalChecked();
Local<Array> keys = Nan::GetOwnPropertyNames(args_hash).ToLocalChecked(); Local<Array> keys = Nan::GetOwnPropertyNames(args_hash).ToLocalChecked();