diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-05-31 13:59:37 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-05-31 13:59:37 -0700 |
| commit | 8bec6f6a55afaa1e321f29bf816d2a010f510b3c (patch) | |
| tree | 525e06b564b9d23d8340e25e7ddb9915fec0b1e5 /src/core/ext/client_config/subchannel.c | |
| parent | 582f4350ed755aac0b07f12b499ad18f86f2a1b7 (diff) | |
| parent | 0d6196025e62aea5aabc6341459f2c370e264230 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
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 08795d1358..a67ec72bd1 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, |