status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpcmodule.c: throw an exception in UPnP_discover() 

fixes #521
This commit is contained in:
Thomas Bernard 2021-01-15 20:21:02 +01:00
parent ef03e1bc21
commit 2adcf3f432
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
miniupnpc/miniupnpcmodule.c
View File

@ -3,7 +3,7 @@
* Project : miniupnp * Project : miniupnp
* Author : Thomas BERNARD * Author : Thomas BERNARD
* website : https://miniupnp.tuxfamily.org/ * website : https://miniupnp.tuxfamily.org/
* copyright (c) 2007-2020 Thomas Bernard * copyright (c) 2007-2021 Thomas Bernard
* This software is subjet to the conditions detailed in the * This software is subjet to the conditions detailed in the
* provided LICENCE file. */ * provided LICENCE file. */
#include <Python.h> #include <Python.h>
@ -122,9 +122,9 @@ UPnPObject_dealloc(UPnPObject *self)
static PyObject * static PyObject *
UPnP_discover(UPnPObject *self) UPnP_discover(UPnPObject *self)
{ {
struct UPNPDev * dev; int error = 0;
int i;
PyObject *res = NULL; PyObject *res = NULL;
if(self->devlist) if(self->devlist)
{ {
freeUPNPDevlist(self->devlist); freeUPNPDevlist(self->devlist);
@ -137,13 +137,21 @@ UPnP_discover(UPnPObject *self)
(int)self->localport, (int)self->localport,
0/*ip v6*/, 0/*ip v6*/,
2/* TTL */, 2/* TTL */,
0/*error */); &error);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
/* Py_RETURN_NONE ??? */ /* Py_RETURN_NONE ??? */
for(dev = self->devlist, i = 0; dev; dev = dev->pNext) if (self->devlist != NULL) {
i++; struct UPNPDev * dev;
res = Py_BuildValue("i", i); int i = 0;
return res;
for(dev = self->devlist; dev; dev = dev->pNext)
i++;
res = Py_BuildValue("i", i);
return res;
} else {
PyErr_SetString(PyExc_Exception, strupnperror(error));
return NULL;
}
} }
static PyObject * static PyObject *