diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-06-21 16:31:08 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-06-21 16:31:35 -0700 |
| commit | c3a9fae601142ec216dbce60944d6a00ae16db3b (patch) | |
| tree | ac8bac94ec45290af51737129bd8b8fa3d567f35 /src/core/lib/channel/channel_args.c | |
| parent | cddf697ab44a7bab1821915e1e3f6a0f08ca1706 (diff) | |
| parent | 5988716d9d6e33cd59631865527d73d3caa87387 (diff) | |
Merge branch 'master' into epoll_changes_merged
Diffstat (limited to 'src/core/lib/channel/channel_args.c')
| -rw-r--r-- | src/core/lib/channel/channel_args.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/lib/channel/channel_args.c b/src/core/lib/channel/channel_args.c index d53ce904a9..79ceeb66b3 100644 --- a/src/core/lib/channel/channel_args.c +++ b/src/core/lib/channel/channel_args.c @@ -149,6 +149,7 @@ grpc_channel_args *grpc_channel_args_normalize(const grpc_channel_args *a) { void grpc_channel_args_destroy(grpc_channel_args *a) { size_t i; + if (!a) return; for (i = 0; i < a->num_args; i++) { switch (a->args[i].type) { case GRPC_ARG_STRING: @@ -212,7 +213,7 @@ static int find_compression_algorithm_states_bitset(const grpc_channel_args *a, grpc_channel_args *grpc_channel_args_compression_algorithm_set_state( grpc_channel_args **a, grpc_compression_algorithm algorithm, int state) { - int *states_arg; + int *states_arg = NULL; grpc_channel_args *result = *a; const int states_arg_found = find_compression_algorithm_states_bitset(*a, &states_arg); |