From bd304b4b580879f8f71532661abbc610641bf91f Mon Sep 17 00:00:00 2001
From: Vishwanath Sastry <sastryv@google.com>
Date: Tue, 30 Apr 2024 01:25:01 -0700
Subject: [PATCH 1/2] [grpc][grpc_fuzzers] Fix for the crash reported in the
 bug 331840428 (#36389)

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #36389

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36389 from sastryvp:fuzzer_331840428 818112d75df6695f30e8383de362deecbfc62cb9
PiperOrigin-RevId: 629331008
---
 test/core/end2end/fuzzers/network_input.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/core/end2end/fuzzers/network_input.cc b/test/core/end2end/fuzzers/network_input.cc
index 3aa25b8f703..855d3185678 100644
--- a/test/core/end2end/fuzzers/network_input.cc
+++ b/test/core/end2end/fuzzers/network_input.cc
@@ -506,8 +506,8 @@ Duration ScheduleConnection(
             Duration::NanosecondsRoundUp(
                 (q.slices.Length() * event_engine->max_delay_write()).count()));
   }
-  delay += Duration::Milliseconds(network_input.connect_delay_ms() +
-                                  network_input.connect_timeout_ms());
+  delay += Duration::Milliseconds(network_input.connect_delay_ms()) +
+           Duration::Milliseconds(network_input.connect_timeout_ms());
   event_engine->RunAfterExactly(
       Duration::Milliseconds(network_input.connect_delay_ms()),
       [event_engine, channel_args,

From aa46d266c5a49178704882cf217d9a76b4e7398c Mon Sep 17 00:00:00 2001
From: Tanvi Jagtap <tjagtap@google.com>
Date: Tue, 30 Apr 2024 06:03:12 -0700
Subject: [PATCH 2/2] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl
 logging GPR_ASSERT

Replacing GPR_ASSERT with absl CHECK in the previous test.

Some instances of CHECK_OK are causing tests to fail.

Fixing.

PiperOrigin-RevId: 629387759
---
 src/core/lib/event_engine/windows/windows_engine.cc |  2 +-
 test/cpp/performance/writes_per_rpc_test.cc         | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc
index 7c99146c004..69a0f94ff53 100644
--- a/src/core/lib/event_engine/windows/windows_engine.cc
+++ b/src/core/lib/event_engine/windows/windows_engine.cc
@@ -370,7 +370,7 @@ EventEngine::ConnectionHandle WindowsEventEngine::Connect(
   auto connection_state = std::make_shared<ConnectionState>();
   grpc_core::MutexLock lock(&connection_state->mu);
   connection_state->socket = iocp_.Watch(sock);
-  CHECK_NE(connection_state->socket, nullptr);
+  CHECK(connection_state->socket != nullptr);
   auto* info = connection_state->socket->write_info();
   connection_state->address = address;
   connection_state->allocator = std::move(memory_allocator);
diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc
index f31602574bc..36b5ba173d1 100644
--- a/test/cpp/performance/writes_per_rpc_test.cc
+++ b/test/cpp/performance/writes_per_rpc_test.cc
@@ -81,16 +81,16 @@ class InProcessCHTTP2 {
           listener_endpoint = std::move(ep);
           listener_started.Notify();
         },
-        [](absl::Status status) { CHECK_OK(status); }, config,
+        [](absl::Status status) { CHECK(status.ok()); }, config,
         std::make_unique<grpc_core::MemoryQuota>("foo"));
     if (!listener.ok()) {
       grpc_core::Crash(absl::StrCat("failed to start listener: ",
                                     listener.status().ToString()));
     }
     auto target_addr = URIToResolvedAddress(addr);
-    CHECK_OK(target_addr);
-    CHECK_OK((*listener)->Bind(*target_addr));
-    CHECK_OK((*listener)->Start());
+    CHECK(target_addr.ok());
+    CHECK((*listener)->Bind(*target_addr).ok());
+    CHECK((*listener)->Start().ok());
     // Creating the client
     std::unique_ptr<EventEngine::Endpoint> client_endpoint;
     grpc_core::Notification client_connected;
@@ -98,7 +98,7 @@ class InProcessCHTTP2 {
         std::make_unique<grpc_core::MemoryQuota>("client");
     std::ignore = fuzzing_engine->Connect(
         [&](absl::StatusOr<std::unique_ptr<EventEngine::Endpoint>> endpoint) {
-          CHECK_OK(endpoint);
+          CHECK(endpoint.ok());
           client_endpoint = std::move(*endpoint);
           client_connected.Notify();
         },