summaryrefslogtreecommitdiffstats
path: root/Modules/socketmodule.c
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-05-09 19:11:33 (GMT)
committerFred Drake <fdrake@acm.org>2001-05-09 19:11:33 (GMT)
commitfd16834ca7eec00fbdbfccbd551d335f2cbd5d3d (patch)
tree84f193ee125964b97fb8cbd7751d9a2e4230eeef /Modules/socketmodule.c
parent5ac946c6975c602117e336dc5f239c4fd38c0b03 (diff)
downloadcpython-fd16834ca7eec00fbdbfccbd551d335f2cbd5d3d.zip
cpython-fd16834ca7eec00fbdbfccbd551d335f2cbd5d3d.tar.gz
cpython-fd16834ca7eec00fbdbfccbd551d335f2cbd5d3d.tar.bz2
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. PySocketSock_recvfrom(): Use PyString_AS_STRING() to get the data pointer of a string we create ourselves; there is no need for the extra type check from PyString_AsString(). This closes SF bug #416573.
Diffstat (limited to 'Modules/socketmodule.c')
-rw-r--r--Modules/socketmodule.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ce572ff..7e14743 100644
--- 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,7 +1362,8 @@ PySocketSock_recvfrom(PySocketSockObject *s, PyObject *args)
if (buf == NULL)
return NULL;
Py_BEGIN_ALLOW_THREADS
- n = recvfrom(s->sock_fd, PyString_AsString(buf), len, flags,
+ memset(addrbuf, 0, addrlen);
+ n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
#ifndef MS_WINDOWS
#if defined(PYOS_OS2)
(struct sockaddr *)addrbuf, &addrlen