From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 20 Sep 2018 16:55:31 +0000 (-0400)
Subject: Use the correct macro to detect an invalid socket in tortls_nss.c
X-Git-Tag: tor-0.3.5.2-alpha~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6c564e09ab491765b6773cc45320bc0f605fcfe;p=thirdparty%2Ftor.git

Use the correct macro to detect an invalid socket in tortls_nss.c

Fixes bug 27782; bugfix on 0.3.5.1-alpha
---

diff --git a/changes/bug27782 b/changes/bug27782
new file mode 100644
index 0000000000..3564c34b68
--- /dev/null
+++ b/changes/bug27782
@@ -0,0 +1,4 @@
+  o Minor bugfixes (NSS):
+    - Correctly detect failure to open a dummy TCP socket when
+      stealing ownership of an fd from the NSS layer. Fixes bug 27782;
+      bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 4e7227b12a..e1e6cc501e 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -444,7 +444,7 @@ tor_tls_release_socket(tor_tls_t *tls)
    */
   tor_socket_t sock =
     tor_open_socket_nonblocking(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  if (!sock) {
+  if (! SOCKET_OK(sock)) {
     log_warn(LD_NET, "Out of sockets when trying to shut down an NSS "
              "connection");
     return;