Commit 851c267c authored by Martin v. Löwis's avatar Martin v. Löwis

Patch #781722: Reject AF_INET6 if IPv6 is disabled. Will backport to 2.3.

parent 5defef12
...@@ -2962,6 +2962,14 @@ socket_inet_pton(PyObject *self, PyObject *args) ...@@ -2962,6 +2962,14 @@ socket_inet_pton(PyObject *self, PyObject *args)
return NULL; return NULL;
} }
#ifndef ENABLE_IPV6
if(af == AF_INET6) {
PyErr_SetString(socket_error,
"can't use AF_INET6, IPv6 is disabled");
return NULL;
}
#endif
retval = inet_pton(af, ip, packed); retval = inet_pton(af, ip, packed);
if (retval < 0) { if (retval < 0) {
PyErr_SetFromErrno(socket_error); PyErr_SetFromErrno(socket_error);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment