diff options
| author |  Noah Eisen <ncteisen@gmail.com> | 2018-02-14 12:38:06 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-14 12:38:06 -0800 |
| commit | 874f8128cde90bccf5979d49f83f8e8cf2b81bd1 (patch) | |
| tree | 7405a24f15ee2656a72927c48f26ff9602d82f0f /src/core | |
| parent | b85b28ee371e02ca4e2439a1890fc9f6a964f70e (diff) | |
| parent | 68c0020709cc2dd4ddaff11961dfd219d80f0366 (diff) | |
Merge pull request #14428 from ncteisen/fuzz-2460
Fix Fuzz 2460
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/filters/client_channel/client_channel.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index 50d562f946..7b04bdc0dd 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -475,8 +475,7 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { // Find service config. channel_arg = grpc_channel_args_find(chand->resolver_result, GRPC_ARG_SERVICE_CONFIG); - if (channel_arg != nullptr) { - GPR_ASSERT(channel_arg->type == GRPC_ARG_STRING); + if (channel_arg != nullptr && channel_arg->type == GRPC_ARG_STRING) { service_config_json = gpr_strdup(channel_arg->value.string); grpc_service_config* service_config = grpc_service_config_create(service_config_json); |