Three uses of makesockaddr() used sockaddr buffers that had not be cleared;

this could cause invalid paths to be returned for AF_UNIX sockets on some
platforms (including FreeBSD 4.2-RELEASE), appearantly because there is
no assurance that the address will be nul-terminated when filled in by the
kernel.

This closes SF bug #416573.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ce572ff4f4e82c1e9b15ff4f326a0a700252d987..df10c8fd1370d55521edeb969423fd575386d1e1 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -790,6 +790,7 @@ PySocketSock_accept(PySocketSockObject *s, PyObject *args)
                return NULL;
        if (!getsockaddrlen(s, &addrlen))
                return NULL;
+       memset(addrbuf, 0, addrlen);
        Py_BEGIN_ALLOW_THREADS
        newfd = accept(s->sock_fd, (struct sockaddr *) addrbuf, &addrlen);
        Py_END_ALLOW_THREADS
@@ -1212,6 +1213,7 @@ PySocketSock_getpeername(PySocketSockObject *s, PyObject *args)
                return NULL;
        if (!getsockaddrlen(s, &addrlen))
                return NULL;
+       memset(addrbuf, 0, addrlen);
        Py_BEGIN_ALLOW_THREADS
        res = getpeername(s->sock_fd, (struct sockaddr *) addrbuf, &addrlen);
        Py_END_ALLOW_THREADS
@@ -1360,6 +1362,7 @@ PySocketSock_recvfrom(PySocketSockObject *s, PyObject *args)
        if (buf == NULL)
                return NULL;
        Py_BEGIN_ALLOW_THREADS
+       memset(addrbuf, 0, addrlen);
        n = recvfrom(s->sock_fd, PyString_AsString(buf), len, flags,
 #ifndef MS_WINDOWS
 #if defined(PYOS_OS2)