From: Zackery Spytz <zspytz@gmail.com>
Date: Thu, 28 Mar 2019 13:53:00 +0000 (-0600)
Subject: bpo-36459: Fix a possible double PyMem_FREE() due to tokenizer.c's tok_nextc() (12601)
X-Git-Tag: v3.8.0a4~311
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cda139d1ded6708665b53e4ed32ccc1d2627e1da;p=thirdparty%2FPython%2Fcpython.git

bpo-36459: Fix a possible double PyMem_FREE() due to tokenizer.c's tok_nextc() (12601)

Remove the PyMem_FREE() call added in cb90c89.  The buffer will be
freed when PyTokenizer_Free() is called on the tokenizer state.
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-03-27-22-35-16.bpo-36459.UAvkKp.rst b/Misc/NEWS.d/next/Core and Builtins/2019-03-27-22-35-16.bpo-36459.UAvkKp.rst
new file mode 100644
index 000000000000..6c234a6a76d9
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-03-27-22-35-16.bpo-36459.UAvkKp.rst	
@@ -0,0 +1 @@
+Fix a possible double ``PyMem_FREE()`` due to tokenizer.c's ``tok_nextc()``.
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index ad054975689e..58dd1cd30b37 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -963,7 +963,6 @@ 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;