[Python-checkins] cpython (3.3): Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() fails.
christian.heimes
python-checkins at python.org
Tue Aug 6 16:03:47 CEST 2013
http://hg.python.org/cpython/rev/5859a3ec5b7e
changeset: 85052:5859a3ec5b7e
branch: 3.3
parent: 85042:791034a0ae1e
user: Christian Heimes <christian at cheimes.de>
date: Tue Aug 06 15:59:16 2013 +0200
summary:
Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() fails.
files:
Misc/NEWS | 3 +++
Parser/myreadline.c | 24 ++++++++++++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
+ fails.
+
- Issue #16741: Fix an error reporting in int().
- Issue #17899: Fix rare file descriptor leak in os.listdir().
diff --git a/Parser/myreadline.c b/Parser/myreadline.c
--- a/Parser/myreadline.c
+++ b/Parser/myreadline.c
@@ -112,7 +112,7 @@
PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
{
size_t n;
- char *p;
+ char *p, *pr;
n = 100;
if ((p = (char *)PyMem_MALLOC(n)) == NULL)
return NULL;
@@ -135,17 +135,29 @@
n = strlen(p);
while (n > 0 && p[n-1] != '\n') {
size_t incr = n+2;
- p = (char *)PyMem_REALLOC(p, n + incr);
- if (p == NULL)
+ if (incr > INT_MAX) {
+ PyMem_FREE(p);
+ PyErr_SetString(PyExc_OverflowError, "input line too long");
return NULL;
- if (incr > INT_MAX) {
- PyErr_SetString(PyExc_OverflowError, "input line too long");
}
+ pr = (char *)PyMem_REALLOC(p, n + incr);
+ if (pr == NULL) {
+ PyMem_FREE(p);
+ PyErr_NoMemory();
+ return NULL;
+ }
+ p = pr;
if (my_fgets(p+n, (int)incr, sys_stdin) != 0)
break;
n += strlen(p+n);
}
- return (char *)PyMem_REALLOC(p, n+1);
+ pr = (char *)PyMem_REALLOC(p, n+1);
+ if (pr == NULL) {
+ PyMem_FREE(p);
+ PyErr_NoMemory();
+ return NULL;
+ }
+ return pr;
}
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list