languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-05 00:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Christian Heimes 2013-08-06 16:03:33 +02:00
parent 9b855de8d2 9ae513caa7
commit 73207e03ad
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

@ -10,6 +10,9 @@ Projected Release date: 2013-09-08
Core and Builtins
-----------------
- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
fail
- Issue #17934: Add a clear() method to frame objects, to help clean up
expensive details (local variables) and break reference cycles.

22
Parser/myreadline.c
View file

@ -112,7 +112,7 @@ char *
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 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
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)
return NULL;
if (incr > INT_MAX) {
PyMem_FREE(p);
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)
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;
}