From 9f3f4837af81e2b8d404513c88823bc92142307f Mon Sep 17 00:00:00 2001
From: Noah Eisen <ncteisen@google.com>
Date: Tue, 13 Feb 2018 17:03:06 -0800
Subject: [PATCH 1/3] Add repro

---
 ...case-minimized-api_fuzzer-4774951120797696 | Bin 0 -> 92 bytes
 tools/run_tests/generated/tests.json          |  23 ++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4774951120797696

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
new file mode 100644
index 0000000000000000000000000000000000000000..36103166b7d3279c5d4f68cdaf9cfa21fc461452
GIT binary patch
literal 92
zcmZQ#VBk_vU|{$U1Pa{DOvR~1WvNAs9E?D~03yJEfhoPHAXyJ2nVFm#pPZkUmYL3|
W0Fe|yGJuDPfkA;$fq@ZdngRgbjurv{

literal 0
HcmV?d00001

diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index a9185b5fb62..5a457cec5b7 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -93307,6 +93307,29 @@
     ], 
     "uses_polling": false
   }, 
+  {
+    "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/crash-0597bbdd657fa4ed14443994c9147a1a7bbc205f"

From ffff5421a7050508a36233210abd1e11a55aa9b1 Mon Sep 17 00:00:00 2001
From: Noah Eisen <ncteisen@google.com>
Date: Wed, 14 Feb 2018 10:56:09 -0800
Subject: [PATCH 2/3] Fix fuzz test

---
 src/core/ext/filters/client_channel/client_channel.cc | 3 +--
 1 file changed, 1 insertion(+), 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 50d562f9467..7b04bdc0dd1 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);

From 68c0020709cc2dd4ddaff11961dfd219d80f0366 Mon Sep 17 00:00:00 2001
From: Noah Eisen <ncteisen@google.com>
Date: Wed, 14 Feb 2018 11:28:11 -0800
Subject: [PATCH 3/3] Re gen projects

---
 tools/run_tests/generated/tests.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 5a457cec5b7..2fa635cdf73 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -93240,7 +93240,7 @@
   }, 
   {
     "args": [
-      "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4829913342279680"
+      "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4774951120797696"
     ], 
     "ci_platforms": [
       "linux"
@@ -93263,7 +93263,7 @@
   }, 
   {
     "args": [
-      "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-5632636438446080"
+      "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4829913342279680"
     ], 
     "ci_platforms": [
       "linux"
@@ -93286,7 +93286,7 @@
   }, 
   {
     "args": [
-      "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-6192640044302336"
+      "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-5632636438446080"
     ], 
     "ci_platforms": [
       "linux"
@@ -93309,7 +93309,7 @@
   }, 
   {
     "args": [
-      "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-4774951120797696"
+      "test/core/end2end/fuzzers/api_fuzzer_corpus/clusterfuzz-testcase-minimized-api_fuzzer-6192640044302336"
     ], 
     "ci_platforms": [
       "linux"