From 22286103e85723a35d3fb1d6d4b3afd35529c38b Mon Sep 17 00:00:00 2001 From: Dimiter 'malkia' Stanev Date: Wed, 20 Nov 2024 15:21:53 -0800 Subject: [PATCH] a bit more fixes --- x/bazel/grpc_ares_fix_2.diff | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 x/bazel/grpc_ares_fix_2.diff diff --git a/x/bazel/grpc_ares_fix_2.diff b/x/bazel/grpc_ares_fix_2.diff new file mode 100644 index 0000000000..96211d3914 --- /dev/null +++ b/x/bazel/grpc_ares_fix_2.diff @@ -0,0 +1,26 @@ +diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +index 37a8f85cc5..b319f17aaf 100644 +--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc ++++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +@@ -224,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd { + // c-ares overloads this recv_from virtual socket function to receive + // data on both UDP and TCP sockets, and from is nullptr for TCP. + if (from != nullptr) { +- CHECK(*from_len <= recv_from_source_addr_len_); ++ CHECK(*from_len >= recv_from_source_addr_len_); + memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_); + *from_len = recv_from_source_addr_len_; + } +diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +index ef70bfc5b6..e8b05452c7 100644 +--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc ++++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +@@ -73,7 +73,7 @@ namespace { + // instantiated at the top of the virtual socket function callstack. + class WSAErrorContext final { + public: +- explicit WSAErrorContext(){}; ++ explicit WSAErrorContext() {}; + + ~WSAErrorContext() { + if (error_ != 0) {