]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-36367: Free buffer if realloc fails in tokenize.c (GH-12442) (GH-12471)
authorVictor Stinner <vstinner@redhat.com>
Wed, 20 Mar 2019 12:03:11 +0000 (13:03 +0100)
committerGitHub <noreply@github.com>
Wed, 20 Mar 2019 12:03:11 +0000 (13:03 +0100)
Parser/tokenizer.c

index 1a36f1c3840a737e92373c8ff552587ff895d00c..34722f85b94a558d2826b00ada142cf5d8a475f3 100644 (file)
@@ -733,9 +733,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;
 }
 
@@ -1050,6 +1055,7 @@ tok_nextc(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;