[tor-commits] [tor/master] Release ownership of the dummy socket that tortls_nss.c will close

nickm at torproject.org nickm at torproject.org
Thu Sep 20 18:09:56 UTC 2018


commit 62b709bc26fe628777d2af4becdf08fd8adf1140
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 20 12:53:39 2018 -0400

    Release ownership of the dummy socket that tortls_nss.c will close
    
    Related to #27795 -- since NSS will close the socket, we must not
    count it as owned by Tor.
---
 src/lib/tls/tortls_nss.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 88d2be8ce..4e7227b12 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -456,6 +456,9 @@ tor_tls_release_socket(tor_tls_t *tls)
   }
 
   PR_ChangeFileDescNativeHandle(tcp, sock);
+  /* Tell our socket accounting layer that we don't own this socket any more:
+   * NSS is about to free it for us. */
+  tor_release_socket_ownership(sock);
 }
 
 void





More information about the tor-commits mailing list