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 | |
| parent | b85b28ee371e02ca4e2439a1890fc9f6a964f70e (diff) | |
| parent | 68c0020709cc2dd4ddaff11961dfd219d80f0366 (diff) | |
Merge pull request #14428 from ncteisen/fuzz-2460
Fix Fuzz 2460
| -rw-r--r-- | src/core/ext/filters/client_channel/client_channel.cc | 3 | ||||
| -rw-r--r-- | test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4774951120797696 | bin | 0 -> 92 bytes | |||
| -rw-r--r-- | tools/run_tests/generated/tests.json | 23 |
3 files changed, 24 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); diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4774951120797696 b/test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4774951120797696 Binary files differnew file mode 100644 index 0000000000..36103166b7 --- /dev/null +++ b/test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4774951120797696 diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index a9185b5fb6..2fa635cdf7 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -93240,6 +93240,29 @@ }, { "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4774951120797696" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "mac", + "linux" + ], + "uses_polling": false + }, + { + "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4829913342279680" ], "ci_platforms": [ |