Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() fails.

This commit is contained in:
Christian Heimes 2013-08-06 15:59:16 +02:00
parent fb29a164df
commit 9ae513caa7
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -12,6 +12,9 @@ What's New in Python 3.3.3 release candidate 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
fails.
- Issue #16741: Fix an error reporting in int(). - Issue #16741: Fix an error reporting in int().
- Issue #17899: Fix rare file descriptor leak in os.listdir(). - Issue #17899: Fix rare file descriptor leak in os.listdir().

22
Parser/myreadline.c
View File

@ -112,7 +112,7 @@ char *
PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt) PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
{ {
size_t n; size_t n;
char *p; char *p, *pr;
n = 100; n = 100;
if ((p = (char *)PyMem_MALLOC(n)) == NULL) if ((p = (char *)PyMem_MALLOC(n)) == NULL)
return NULL; return NULL;
@ -135,17 +135,29 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
n = strlen(p); n = strlen(p);
while (n > 0 && p[n-1] != '\n') { while (n > 0 && p[n-1] != '\n') {
size_t incr = n+2; size_t incr = n+2;
p = (char *)PyMem_REALLOC(p, n + incr);
if (p == NULL)
return NULL;
if (incr > INT_MAX) { if (incr > INT_MAX) {
PyMem_FREE(p);
PyErr_SetString(PyExc_OverflowError, "input line too long"); PyErr_SetString(PyExc_OverflowError, "input line too long");
return NULL;
} }
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) if (my_fgets(p+n, (int)incr, sys_stdin) != 0)
break; break;
n += strlen(p+n); 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;
} }