From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 6 Jun 2020 00:10:57 +0000 (-0700)
Subject: bpo-40883: Fix memory leak in fstring_compile_expr in parse_string.c (GH-20667)
X-Git-Tag: v3.9.0b2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79e6c15aed9b4b50efd39ddaf1dc40c374b51213;p=thirdparty%2FPython%2Fcpython.git

bpo-40883: Fix memory leak in fstring_compile_expr in parse_string.c (GH-20667)

(cherry picked from commit a54096e30523534e8eebb8dc1011b4536ed237a8)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-06-05-23-25-00.bpo-40883.M6sQ-Q.rst b/Misc/NEWS.d/next/Core and Builtins/2020-06-05-23-25-00.bpo-40883.M6sQ-Q.rst
new file mode 100644
index 000000000000..ebeb0cc60d16
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-06-05-23-25-00.bpo-40883.M6sQ-Q.rst	
@@ -0,0 +1 @@
+Fix memory leak in when parsing f-strings in the new parser. Patch by Pablo Galindo
\ No newline at end of file
diff --git a/Parser/pegen/parse_string.c b/Parser/pegen/parse_string.c
index e24ecc58d3aa..efe82df47658 100644
--- a/Parser/pegen/parse_string.c
+++ b/Parser/pegen/parse_string.c
@@ -604,6 +604,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
 
     struct tok_state* tok = PyTokenizer_FromString(str, 1);
     if (tok == NULL) {
+        PyMem_RawFree(str);
         return NULL;
     }
     Py_INCREF(p->tok->filename);
@@ -629,6 +630,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
     result = expr;
 
 exit:
+    PyMem_RawFree(str);
     _PyPegen_Parser_Free(p2);
     PyTokenizer_Free(tok);
     return result;