Merge branch 'e2efuzz' of github.com:ctiller/grpc into e2efuzz

4 files changed, 4 insertions, 3 deletions

diff --git a/test/core/end2end/fuzzers/server_fuzzer.c b/test/core/end2end/fuzzers/server_fuzzer.c
index 2d590a3e0f..393d33033b 100644
--- a/test/core/end2end/fuzzers/server_fuzzer.c
+++ b/test/core/end2end/fuzzers/server_fuzzer.c
@@ -37,6 +37,8 @@
 #include "src/core/lib/surface/server.h"
 #include "test/core/util/mock_endpoint.h"
 
+static const bool squelch = true;
+
 static void discard_write(gpr_slice slice) {}
 
 static void *tag(int n) { return (void *)(uintptr_t)n; }
@@ -46,7 +48,7 @@ static void dont_log(gpr_log_func_args *args) {}
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   grpc_test_only_set_metadata_hash_seed(0);
-  gpr_set_log_function(dont_log);
+  if (squelch) gpr_set_log_function(dont_log);
   grpc_init();
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
 
diff --git a/test/core/end2end/fuzzers/server_fuzzer_corpus/2b14c6e618ec95754ea7e24fe6bc5a3a97df6897 b/test/core/end2end/fuzzers/server_fuzzer_corpus/2b14c6e618ec95754ea7e24fe6bc5a3a97df6897
new file mode 100644
index 0000000000..3c79631396
--- /dev/null
+++ b/test/core/end2end/fuzzers/server_fuzzer_corpus/2b14c6e618ec95754ea7e24fe6bc5a3a97df6897
diff --git a/test/core/end2end/fuzzers/server_fuzzer_corpus/c56fada76f5c198232201a608072a1a63e3d3785 b/test/core/end2end/fuzzers/server_fuzzer_corpus/c56fada76f5c198232201a608072a1a63e3d3785
new file mode 100644
index 0000000000..f7092e5e02
--- /dev/null
+++ b/test/core/end2end/fuzzers/server_fuzzer_corpus/c56fada76f5c198232201a608072a1a63e3d3785
diff --git a/test/core/end2end/tests/filter_causes_close.c b/test/core/end2end/tests/filter_causes_close.c
index d4a9f6fac4..ca54167b20 100644
--- a/test/core/end2end/tests/filter_causes_close.c
+++ b/test/core/end2end/tests/filter_causes_close.c
@@ -200,8 +200,7 @@ static void test_request(grpc_end2end_test_config config) {
 
 typedef struct { grpc_closure *recv_im_ready; } call_data;
 
-typedef struct {
-} channel_data;
+typedef struct { uint8_t unused; } channel_data;
 
 static void recv_im_ready(grpc_exec_ctx *exec_ctx, void *arg, bool success) {
   grpc_call_element *elem = arg;