diff options
Diffstat (limited to 'ports/grpc/00005-fix-uwp-error.patch')
| -rw-r--r-- | ports/grpc/00005-fix-uwp-error.patch | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/ports/grpc/00005-fix-uwp-error.patch b/ports/grpc/00005-fix-uwp-error.patch index 93ac05d1b..ad890cf00 100644 --- a/ports/grpc/00005-fix-uwp-error.patch +++ b/ports/grpc/00005-fix-uwp-error.patch @@ -1,8 +1,8 @@ diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc -index c0e2164..331e54c 100644 +index 0dacbfef3e..310bf1de1b 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc -@@ -214,6 +214,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p, +@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p, size_t len) { uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get()); grpc_slice slice; @@ -10,16 +10,25 @@ index c0e2164..331e54c 100644 if (len <= sizeof(slice.data.inlined.bytes)) { slice.refcount = nullptr; slice.data.inlined.length = len; +@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) { + } + + grpc_slice grpc_slice_from_cpp_string(std::string str) { +- grpc_slice slice; ++ grpc_slice slice = { 0 }; + if (str.size() <= sizeof(slice.data.inlined.bytes)) { + slice.refcount = nullptr; + slice.data.inlined.length = str.size(); diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc -index 998eb6d..a6e26d3 100644 +index cab0cd56c4..2c88fd625b 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc -@@ -1095,7 +1095,7 @@ grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx, +@@ -1301,7 +1301,7 @@ grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); return GRPC_CALL_OK; } - RequestMatcherInterface* rm; + RequestMatcherInterface* rm = nullptr; switch (rc->type) { - case BATCH_CALL: - rm = server->unregistered_request_matcher; + case RequestedCallType::BATCH_CALL: + rm = server->unregistered_request_matcher.get(); |