Fix file and socket leak

[tsdunc]

Patch...

diff --git a/sources/opensource/Pynetinfo-0.2.3/iface.c b/sources/opensource/Pynetinfo-0.2.3/iface.c index f5b50ba..5f52fd7 100644 --- a/sources/opensource/Pynetinfo-0.2.3/iface.c +++ b/sources/opensource/Pynetinfo-0.2.3/iface.c @@ -55,6 +55,7 @@ PyObject netinfo_list_active_devs(PyObject self, PyObject *args) ret = ioctl(fd, SIOCGIFCONF, &ifc); if (ret < 0) { PyErr_SetFromErrno(PyExc_Exception);

• close(fd); return NULL; } ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq)); @@ -64,6 +65,7 @@ PyObject netinfo_list_active_devs(PyObject self, PyObject *args) _PyTuple_Resize(&tuple, i); PyTuple_SET_ITEM(tuple, i++-1, Py_BuildValue("s", ifr->ifr_name)); }
• close(fd); return tuple; }

@@ -93,32 +95,40 @@ PyObject netinfo_get_addr(PyObject self, PyObject args, int cmd) char dev; struct sockaddr_in *sin; char hwaddr[18];

• PyObject _rval; + fd = socket(AF_INET, SOCKDGRAM, 0); / open a socket to examine _/ if (fd < 0) { PyErr_SetFromErrno(PyExc_Exception); return NULL; } ret = PyArgParseTuple(args, "s", &dev); / parse argument */
• if (!ret)
• if (!ret) {
• close(fd); return NULL;
• } memset(&ifreq, 0, sizeof(struct ifreq)); strncpy(ifreq.ifr_name, dev, IFNAMSIZ-1); ifreq.ifr_addr.sa_family = AF_INET; ret = ioctl(fd, cmd, &ifreq, sizeof(struct ifreq)); if (ret < 0) { PyErr_SetFromErrno(PyExc_Exception);
• close(fd); return NULL; } switch (cmd) { case SIOCGIFADDR: sin = (struct sockaddr_in *)&(ifreq.ifr_ifru.ifru_addr);
• return Py_BuildValue("s", inet_ntoa(sin->sin_addr));
• rval = Py_BuildValue("s", inet_ntoa(sin->sin_addr));
• break; case SIOCGIFNETMASK: sin = (struct sockaddr_in *)&(ifreq.ifr_ifru.ifru_netmask);
• return Py_BuildValue("s", inet_ntoa(sin->sin_addr));
• rval = Py_BuildValue("s", inet_ntoa(sin->sin_addr));
• break; case SIOCGIFBRDADDR: sin = (struct sockaddr_in *)&(ifreq.ifr_ifru.ifru_broadaddr);
• return Py_BuildValue("s", inet_ntoa(sin->sin_addr));
• rval = Py_BuildValue("s", inet_ntoa(sin->sin_addr));
• break; case SIOCGIFHWADDR: snprintf(hwaddr, 18, "%02X:%02X:%02X:%02X:%02X:%02X", (unsigned char)ifreq.ifr_ifru.ifru_hwaddr.sa_data[0], @@ -127,9 +137,14 @@ PyObject netinfo_get_addr(PyObject self, PyObject *args, int cmd) (unsigned char)ifreq.ifr_ifru.ifru_hwaddr.sa_data[3], (unsigned char)ifreq.ifr_ifru.ifru_hwaddr.sa_data[4], (unsigned char)ifreq.ifr_ifru.ifru_hwaddr.sa_data[5]);
• return Py_BuildValue("s", hwaddr);
• rval = Py_BuildValue("s", hwaddr);
• break;
• default:
• rval = NULL;
• break; }
• return NULL;
• close(fd);

• return rval; }

  PyObject netinfo_get_ip(PyObject self, PyObject args) @@ -175,6 +190,7 @@ PyObject netinfo_set_state(PyObject self, PyObject args) ret = ioctl(fd, SIOCGIFFLAGS, &ifreq); if (ret < 0) { PyErr_SetFromErrno(PyExc_Exception);

• close(fd); return NULL; } if (state) @@ -184,8 +200,10 @@ PyObject netinfo_set_state(PyObject self, PyObject *args) ret = ioctl(fd, SIOCSIFFLAGS, &ifreq); if (ret < 0) { PyErr_SetFromErrno(PyExc_Exception);
• close(fd); return NULL; }
• close(fd); return Py_None; }

@@ -223,8 +241,10 @@ PyObject netinfo_set_addr(PyObject self, PyObject *args, int cmd) ret = ioctl(fd, cmd, &ifreq, sizeof(struct ifreq)); if (ret < 0) { PyErr_SetFromErrno(PyExc_Exception);

• close(fd); return NULL; }
• close(fd); return Py_None; }

diff --git a/sources/opensource/Pynetinfo-0.2.3/route.c b/sources/opensource/Pynetinfo-0.2.3/route.c index 94e6b6f..5d56a4c 100644 --- a/sources/opensource/Pynetinfo-0.2.3/route.c +++ b/sources/opensource/Pynetinfo-0.2.3/route.c @@ -45,8 +45,10 @@ PyObject _netinfo_adddel_route(PyObject self, PyObject args, int action) return NULL; } ret = PyArgParseTuple(args, "ssss", &dev, &dest, &gateway, &netmask); / parse argument */

• if (!ret)
• if (!ret) {
• close(fd); return NULL;
• } /* set up route entry / memset(&rtentry, 0, sizeof(struct rtentry)); if (strlen(dev) > 0) / null if no device specified (os guesses) / @@ -73,8 +75,10 @@ PyObject netinfo_adddel_route(PyObject self, PyObject args, int action) ret = ioctl(fd, action ? SIOCADDRT : SIOCDELRT, &rtentry); if (ret < 0) { PyErr_SetFromErrno(PyExc_Exception);
• close(fd); return NULL; }
• close(fd); return Py_None; }

@@ -102,6 +106,7 @@ PyObject netinfo_get_routes(PyObject self, PyObject *args) } if (!fgets(buffer, 1024, file)) { PyErr_SetFromErrno(PyExc_Exception);

• fclose(file); return NULL; } // strtok_r(buffer, " \t", &tok); @@ -139,6 +144,7 @@ PyObject netinfo_get_routes(PyObject self, PyObject *args) _PyTuple_Resize(&tuple, i); PyTuple_SET_ITEM(tuple, i++-1, dict); }
• fclose(file); return tuple; }