traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

socket_inet_aton(): ip_addr was left undefined before use in the 

!HAVE_INET_ATON case.  Repaired that, and tried to repair what looked
like out-of-date comments.
This commit is contained in:
Tim Peters 2003-02-13 03:13:40 +00:00
parent 12d31e2e9d
commit 1df9fdd4d5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/socketmodule.c
View File

@ -2710,16 +2710,19 @@ socket_inet_aton(PyObject *self, PyObject *args)
#ifndef INADDR_NONE #ifndef INADDR_NONE
#define INADDR_NONE (-1) #define INADDR_NONE (-1)
#endif #endif
/* Have to use inet_addr() instead */
char *ip_addr;
#ifdef HAVE_INET_ATON #ifdef HAVE_INET_ATON
struct in_addr buf; struct in_addr buf;
#else
/* Have to use inet_addr() instead */
unsigned long packed_addr;
#endif
char *ip_addr;
if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr)) { if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr))
return NULL; return NULL;
}
#ifdef HAVE_INET_ATON
if (inet_aton(ip_addr, &buf)) if (inet_aton(ip_addr, &buf))
return PyString_FromStringAndSize((char *)(&buf), return PyString_FromStringAndSize((char *)(&buf),
sizeof(buf)); sizeof(buf));
@ -2728,11 +2731,9 @@ socket_inet_aton(PyObject *self, PyObject *args)
"illegal IP address string passed to inet_aton"); "illegal IP address string passed to inet_aton");
return NULL; return NULL;
#else /* In case you don't have inet_aton() */ #else /* ! HAVE_INET_ATON */
/* XXX Problem here: inet_aton('255.255.255.255') raises /* XXX Problem here: inet_aton('255.255.255.255') raises
an exception while it should be a valid address. */ an exception while it should be a valid address. */
unsigned long packed_addr;
packed_addr = inet_addr(ip_addr); packed_addr = inet_addr(ip_addr);
if (packed_addr == INADDR_NONE) { /* invalid address */ if (packed_addr == INADDR_NONE) { /* invalid address */
@ -2740,7 +2741,6 @@ socket_inet_aton(PyObject *self, PyObject *args)
"illegal IP address string passed to inet_aton"); "illegal IP address string passed to inet_aton");
return NULL; return NULL;
} }
return PyString_FromStringAndSize((char *) &packed_addr, return PyString_FromStringAndSize((char *) &packed_addr,
sizeof(packed_addr)); sizeof(packed_addr));
#endif #endif