diff options
Diffstat (limited to 'Modules/socketmodule.c')
| -rw-r--r-- | Modules/socketmodule.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index a160fee..7b6046d 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -3909,8 +3909,13 @@ socket_getnameinfo(PyObject *self, PyObject *args) flags = flowinfo = scope_id = 0; if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags)) return NULL; - if (!PyArg_ParseTuple(sa, "si|ii", - &hostp, &port, &flowinfo, &scope_id)) + if (!PyTuple_Check(sa)) { + PyErr_SetString(PyExc_TypeError, + "getnameinfo() argument 1 must be a tuple"); + return NULL; + } + if (!PyArg_ParseTuple(sa, "si|ii", + &hostp, &port, &flowinfo, &scope_id)) return NULL; PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port); memset(&hints, 0, sizeof(hints)); @@ -3933,9 +3938,7 @@ socket_getnameinfo(PyObject *self, PyObject *args) switch (res->ai_family) { case AF_INET: { - char *t1; - int t2; - if (PyArg_ParseTuple(sa, "si", &t1, &t2) == 0) { + if (PyTuple_GET_SIZE(sa) != 2) { PyErr_SetString(socket_error, "IPv4 sockaddr must be 2 tuple"); goto fail; |