From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 Feb 2015 20:24:13 +0000 (-0500)
Subject: Fix a trivial double-close in address.c. CID 1268071
X-Git-Tag: tor-0.2.6.3-alpha~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2af7bc5b46b23717f30d412bd630e56edde77a3b;p=thirdparty%2Ftor.git

Fix a trivial double-close in address.c. CID 1268071
---

diff --git a/src/common/address.c b/src/common/address.c
index dbb92759d4..d8202e17a5 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1448,7 +1448,6 @@ get_interface_addresses_ioctl(int severity)
 
     if (ioctl(fd, SIOCGIFCONF, &ifc) < 0) {
       tor_log(severity, LD_NET, "ioctl failed: %s", strerror(errno));
-      close(fd);
       goto done;
     }
     /* Ensure we have least IFREQ_SIZE bytes unused at the end. Otherwise, we
@@ -1457,7 +1456,8 @@ get_interface_addresses_ioctl(int severity)
   result = ifreq_to_smartlist(ifc.ifc_buf, ifc.ifc_len);
 
  done:
-  close(fd);
+  if (fd >= 0)
+    close(fd);
   tor_free(ifc.ifc_buf);
   return result;
 }