Skip to content

Commit 2228610

Browse files
committed
a bit more fixes
1 parent 521fd4a commit 2228610

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

x/bazel/grpc_ares_fix_2.diff

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
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
2+
index 37a8f85cc5..b319f17aaf 100644
3+
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
4+
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
5+
@@ -224,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
6+
// c-ares overloads this recv_from virtual socket function to receive
7+
// data on both UDP and TCP sockets, and from is nullptr for TCP.
8+
if (from != nullptr) {
9+
- CHECK(*from_len <= recv_from_source_addr_len_);
10+
+ CHECK(*from_len >= recv_from_source_addr_len_);
11+
memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
12+
*from_len = recv_from_source_addr_len_;
13+
}
14+
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
15+
index ef70bfc5b6..e8b05452c7 100644
16+
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
17+
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
18+
@@ -73,7 +73,7 @@ namespace {
19+
// instantiated at the top of the virtual socket function callstack.
20+
class WSAErrorContext final {
21+
public:
22+
- explicit WSAErrorContext(){};
23+
+ explicit WSAErrorContext() {};
24+
25+
~WSAErrorContext() {
26+
if (error_ != 0) {

0 commit comments

Comments
 (0)