From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Tue, 7 Feb 2017 18:23:53 +0000 (+0100)
Subject: Plug an fd leak in the OpenBSD-specific code for _first_
X-Git-Tag: 2.12~26^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F202%2Fhead;p=i3%2Fi3status

Plug an fd leak in the OpenBSD-specific code for _first_
---

diff --git a/src/first_network_device.c b/src/first_network_device.c
index 4e68006..5932385 100644
--- a/src/first_network_device.c
+++ b/src/first_network_device.c
@@ -94,18 +94,21 @@ static net_type_t iface_type(const char *ifname) {
     strlcpy(bssid.i_name, ifname, sizeof(bssid.i_name));
     ibssid = ioctl(s, SIOCG80211BSSID, &bssid);
 
-    if (ibssid == 0 || inwid == 0)
+    if (ibssid == 0 || inwid == 0) {
+        close(s);
         return NET_TYPE_WIRELESS;
+    }
 
     (void)memset(&ifmr, 0, sizeof(ifmr));
     (void)strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
 
-    if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0)
+    if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
+        close(s);
         return NET_TYPE_OTHER;
-    else
+    } else {
+        close(s);
         return NET_TYPE_ETHERNET;
-
-    close(s);
+    }
 #else
 #error Missing implementation to determine interface type.
 #endif