diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-05-22 15:24:21 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-05-22 15:24:21 -0700 |
| commit | 22cfb658464526d15b6b2ae603b798adf1941895 (patch) | |
| tree | 28142174a3d12b44075e0312ea641e2372864a59 /src/core/ext/client_config/subchannel.c | |
| parent | 62a0b5941b413a88e3589ec4b0191f6eb55e3b11 (diff) | |
| parent | 336292d2f38b9883e2002f1f1c89704b971d62a6 (diff) | |
Merge github.com:grpc/grpc into error
Diffstat (limited to 'src/core/ext/client_config/subchannel.c')
| -rw-r--r-- | src/core/ext/client_config/subchannel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/client_config/subchannel.c b/src/core/ext/client_config/subchannel.c index 0c175cd6c7..dd61caea94 100644 --- a/src/core/ext/client_config/subchannel.c +++ b/src/core/ext/client_config/subchannel.c @@ -320,7 +320,7 @@ grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx, c->filters = NULL; } c->addr = gpr_malloc(args->addr_len); - memcpy(c->addr, args->addr, args->addr_len); + if (args->addr_len) memcpy(c->addr, args->addr, args->addr_len); c->pollset_set = grpc_pollset_set_create(); c->addr_len = args->addr_len; grpc_set_initial_connect_string(&c->addr, &c->addr_len, |