aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/node/ext/channel.cc
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@ctiller.mtv.corp.google.com>2015-11-16 11:34:24 -0800
committerGravatar Craig Tiller <ctiller@ctiller.mtv.corp.google.com>2015-11-16 11:34:24 -0800
commit36da1380afab7c3f081e2008e521f0bd1d851358 (patch)
treebac946254e3f03dd74520ba1ae67e7461088c12e /src/node/ext/channel.cc
parent892f2d372641967c5fe18c72b60393eca913c8f2 (diff)
parent118c0a0eec5cedfb4d610483c3e26dacf71bcd4a (diff)
Merge github.com:grpc/grpc into new_op
Diffstat (limited to 'src/node/ext/channel.cc')
-rw-r--r--src/node/ext/channel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/ext/channel.cc b/src/node/ext/channel.cc
index 584a0cf8ab..c11734d737 100644
--- a/src/node/ext/channel.cc
+++ b/src/node/ext/channel.cc
@@ -82,7 +82,7 @@ bool ParseChannelArgs(Local<Value> args_val,
return false;
}
grpc_channel_args *channel_args = reinterpret_cast<grpc_channel_args*>(
- malloc(sizeof(channel_args)));
+ malloc(sizeof(grpc_channel_args)));
*channel_args_ptr = channel_args;
Local<Object> args_hash = Nan::To<Object>(args_val).ToLocalChecked();
Local<Array> keys = Nan::GetOwnPropertyNames(args_hash).ToLocalChecked();