mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

* ceval.c: ifdef out the last argument passing compat hack.

Browse source 
* Fixed memory leaks in socket, select and sv modules: mkvalue("O", v)
  does INCREF(v) so if v is brand new it should be XDECREF'd
This commit is contained in:
Guido van Rossum 1993-02-05 09:46:15 +00:00
parent 995c33a2bb
commit 6f5afc9a73
4 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Modules/socketmodule.c
View file

@ -223,7 +223,10 @@ makesockaddr(addr, addrlen)
case AF_INET:
{
struct sockaddr_in *a = (struct sockaddr_in *) addr;
return mkvalue("Oi", makeipaddr(a), ntohs(a->sin_port));
object *addr = makeipaddr(a);
object *ret = mkvalue("Oi", addr, ntohs(a->sin_port));
XDECREF(addr);
return ret;
}
case AF_UNIX:
@ -342,7 +345,7 @@ sock_accept(s, args)
{
char addrbuf[256];
int addrlen, newfd;
object *res;
object *sock, *addr, *res;
if (!getnoarg(args))
return NULL;
if (!getsockaddrlen(s, &addrlen))
@ -354,13 +357,16 @@ sock_accept(s, args)
return socket_error();
/* Create the new object with unspecified family,
to avoid calls to bind() etc. on it. */
res = mkvalue("OO", (object *) newsockobject(newfd,
s->sock_family,
s->sock_type,
s->sock_proto),
makesockaddr((struct sockaddr *) addrbuf, addrlen));
if (res == NULL)
sock = (object *) newsockobject(newfd,
s->sock_family,
s->sock_type,
s->sock_proto);
if (sock == NULL)
close(newfd);
addr = makesockaddr((struct sockaddr *) addrbuf, addrlen);
res = mkvalue("OO", sock, addr);
XDECREF(sock);
XDECREF(addr);
return res;
}
@ -693,7 +699,7 @@ sock_recvfrom(s, args)
object *args;
{
char addrbuf[256];
object *buf;
object *buf, *addr, *ret;
int addrlen, len, n;
if (!getintarg(args, &len))
return NULL;
@ -708,8 +714,11 @@ sock_recvfrom(s, args)
return socket_error();
if (resizestring(&buf, n) < 0)
return NULL;
return mkvalue("OO", buf,
makesockaddr((struct sockaddr *)addrbuf, addrlen));
addr = makesockaddr((struct sockaddr *)addrbuf, addrlen);
ret = mkvalue("OO", buf, addr);
XDECREF(addr);
XDECREF(buf);
return ret;
}