Skip to content
Snippets Groups Projects
Commit 3e50a658 authored by Craig Tiller's avatar Craig Tiller
Browse files

Merge pull request #1941 from jtattermusch/fix_csharp_crash

Fix C# test access violation exception on Windows
parents 7faeea50 c2e5be99
No related branches found
No related tags found
No related merge requests found
...@@ -135,9 +135,9 @@ static void do_request(void *rp) { ...@@ -135,9 +135,9 @@ static void do_request(void *rp) {
grpc_resolve_cb cb = r->cb; grpc_resolve_cb cb = r->cb;
gpr_free(r->name); gpr_free(r->name);
gpr_free(r->default_port); gpr_free(r->default_port);
grpc_iomgr_unregister_object(&r->iomgr_object);
gpr_free(r); gpr_free(r);
cb(arg, resolved); cb(arg, resolved);
grpc_iomgr_unregister_object(&r->iomgr_object);
} }
void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) {
......
...@@ -85,13 +85,13 @@ int grpc_winsocket_shutdown(grpc_winsocket *socket) { ...@@ -85,13 +85,13 @@ int grpc_winsocket_shutdown(grpc_winsocket *socket) {
both memory and sockets. */ both memory and sockets. */
void grpc_winsocket_orphan(grpc_winsocket *winsocket) { void grpc_winsocket_orphan(grpc_winsocket *winsocket) {
SOCKET socket = winsocket->socket; SOCKET socket = winsocket->socket;
grpc_iomgr_unregister_object(&winsocket->iomgr_object);
if (winsocket->read_info.outstanding || winsocket->write_info.outstanding) { if (winsocket->read_info.outstanding || winsocket->write_info.outstanding) {
grpc_iocp_socket_orphan(winsocket); grpc_iocp_socket_orphan(winsocket);
} else { } else {
grpc_winsocket_destroy(winsocket); grpc_winsocket_destroy(winsocket);
} }
closesocket(socket); closesocket(socket);
grpc_iomgr_unregister_object(&winsocket->iomgr_object);
} }
void grpc_winsocket_destroy(grpc_winsocket *winsocket) { void grpc_winsocket_destroy(grpc_winsocket *winsocket) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment