Commit cb90c89d authored by Pablo Galindo's avatar Pablo Galindo Committed by GitHub

bpo-36367: Free buffer if realloc fails in tokenize.c (GH-12442)

parent dcf61715
...@@ -649,9 +649,14 @@ translate_newlines(const char *s, int exec_input, struct tok_state *tok) { ...@@ -649,9 +649,14 @@ translate_newlines(const char *s, int exec_input, struct tok_state *tok) {
} }
*current = '\0'; *current = '\0';
final_length = current - buf + 1; final_length = current - buf + 1;
if (final_length < needed_length && final_length) if (final_length < needed_length && final_length) {
/* should never fail */ /* should never fail */
buf = PyMem_REALLOC(buf, final_length); char* result = PyMem_REALLOC(buf, final_length);
if (result == NULL) {
PyMem_FREE(buf);
}
buf = result;
}
return buf; return buf;
} }
...@@ -958,6 +963,7 @@ tok_nextc(struct tok_state *tok) ...@@ -958,6 +963,7 @@ tok_nextc(struct tok_state *tok)
newbuf = (char *)PyMem_REALLOC(newbuf, newbuf = (char *)PyMem_REALLOC(newbuf,
newsize); newsize);
if (newbuf == NULL) { if (newbuf == NULL) {
PyMem_FREE(tok->buf);
tok->done = E_NOMEM; tok->done = E_NOMEM;
tok->cur = tok->inp; tok->cur = tok->inp;
return EOF; return EOF;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment