mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #14761: Fix potential leak on an error case in the import machinery.

This commit is contained in:
Antoine Pitrou 2012-05-09 13:24:31 +02:00
parent 5ec0340ce1
commit 284fa08eb7
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -127,6 +127,7 @@ Tony Campbell
Brett Cannon Brett Cannon
Mike Carlton Mike Carlton
Terry Carroll Terry Carroll
Damien Cassou
Lorenzo M. Catucci Lorenzo M. Catucci
Donn Cave Donn Cave
Charles Cazabon Charles Cazabon

2
Misc/NEWS
View File

@ -9,6 +9,8 @@ What's New in Python 2.7.4
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #14761: Fix potential leak on an error case in the import machinery.
- Issue #14699: Fix calling the classmethod descriptor directly. - Issue #14699: Fix calling the classmethod descriptor directly.
- Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError - Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError

3
Python/import.c
View File

@ -998,7 +998,7 @@ load_source_module(char *name, char *pathname, FILE *fp)
FILE *fpc; FILE *fpc;
char *buf; char *buf;
char *cpathname; char *cpathname;
PyCodeObject *co; PyCodeObject *co = NULL;
PyObject *m; PyObject *m;
if (fstat(fileno(fp), &st) != 0) { if (fstat(fileno(fp), &st) != 0) {
@ -1054,6 +1054,7 @@ load_source_module(char *name, char *pathname, FILE *fp)
return m; return m;
error_exit: error_exit:
Py_XDECREF(co);
PyMem_FREE(buf); PyMem_FREE(buf);
return NULL; return NULL;
} }