diff options
author | stratakis <cstratak@redhat.com> | 2019-03-19 10:43:20 (GMT) |
---|---|---|
committer | Victor Stinner <vstinner@redhat.com> | 2019-03-19 10:43:20 (GMT) |
commit | d9c6564f90ead067c2e288f01825684821b7a129 (patch) | |
tree | 0fd1a4e7002031113d3f561ca9cd127cf1f31a39 /Parser/myreadline.c | |
parent | 0f68d4af3b9410821ee67cbb5a445b341d5c82e4 (diff) | |
download | cpython-d9c6564f90ead067c2e288f01825684821b7a129.zip cpython-d9c6564f90ead067c2e288f01825684821b7a129.tar.gz cpython-d9c6564f90ead067c2e288f01825684821b7a129.tar.bz2 |
[2.7] bpo-18368: Fix memory leaks in PyOS_StdioReadline() when realloc() fails (GH-12334)
(cherry picked from commit 9ae513caa74a05970458dee17fb995ea49965bb5)
Diffstat (limited to 'Parser/myreadline.c')
-rw-r--r-- | Parser/myreadline.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/Parser/myreadline.c b/Parser/myreadline.c index 59db41a..5376214 100644 --- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -108,7 +108,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; @@ -140,17 +140,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; } |