From 469b0a50d990bcb441910b23194c131e403c2833 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 20 Mar 2019 13:03:41 +0100 Subject: bpo-36367: Free buffer if realloc fails in tokenize.c (GH-12442) (GH-12470) (cherry picked from commit cb90c89de14aab636739b3e810cf949e47b54a0c) --- Parser/tokenizer.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index c6e61df..6d7869c 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -656,9 +656,14 @@ translate_newlines(const char *s, int exec_input, struct tok_state *tok) { } *current = '\0'; final_length = current - buf + 1; - if (final_length < needed_length && final_length) + if (final_length < needed_length && final_length) { /* 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; } @@ -974,6 +979,7 @@ tok_nextc(register struct tok_state *tok) newbuf = (char *)PyMem_REALLOC(newbuf, newsize); if (newbuf == NULL) { + PyMem_FREE(tok->buf); tok->done = E_NOMEM; tok->cur = tok->inp; return EOF; -- cgit v0.12