diff options
| author |  Noah Eisen <ncteisen@gmail.com> | 2018-02-14 09:51:56 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-14 09:51:56 -0800 |
| commit | e27b27bcea1ad3e28364b7af4933cad365e24d53 (patch) | |
| tree | 94efe73d034aa48689edd3d083ef152ad4d6765b | |
| parent | 7973c0c15c4b49e75bdcf2841c10c8e074ffddc4 (diff) | |
| parent | 49cab8f4c6e7642a376eb1ec835a4790a53d19a3 (diff) | |
Merge pull request #14423 from ncteisen/fuzz-4147
Fix Fuzz 4147
| -rw-r--r-- | src/core/ext/filters/client_channel/http_connect_handshaker.cc | 3 | ||||
| -rw-r--r-- | test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-5632636438446080 | bin | 0 -> 57 bytes | |||
| -rw-r--r-- | tools/run_tests/generated/tests.json | 23 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index 6bb4cefe73..88bcc03a3c 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -254,7 +254,8 @@ static void http_connect_handshaker_do_handshake( // If not found, invoke on_handshake_done without doing anything. const grpc_arg* arg = grpc_channel_args_find(args->args, GRPC_ARG_HTTP_CONNECT_SERVER); - if (arg == nullptr) { + if (arg == nullptr || arg->type != GRPC_ARG_STRING) { + gpr_log(GPR_INFO, "HTTP CONNECT channel arg not found or invalid"); // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. gpr_mu_lock(&handshaker->mu); diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-5632636438446080 b/test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-5632636438446080 Binary files differnew file mode 100644 index 0000000000..4f995ac8e1 --- /dev/null +++ b/test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-5632636438446080 diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 44b5a81bdc..dbbbc535ab 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -93263,6 +93263,29 @@ }, { "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-5632636438446080" + ], + "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/crash-0597bbdd657fa4ed14443994c9147a1a7bbc205f" ], "ci_platforms": [ |