From: Miss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 25 Oct 2020 23:24:56 +0000 (-0700)
Subject: bpo-42150: Avoid buffer overflow in the new parser (GH-22978)
X-Git-Tag: v3.9.1rc1~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b290dd2171e745d94f48298cafb2327eb2de17c;p=thirdparty%2FPython%2Fcpython.git

bpo-42150: Avoid buffer overflow in the new parser (GH-22978)

(cherry picked from commit e68c67805e6a4c4ec80bea64be0e8373cc02d322)

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

diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-10-25-21-14-18.bpo-42150.b70u_T.rst b/Misc/NEWS.d/next/Core and Builtins/2020-10-25-21-14-18.bpo-42150.b70u_T.rst
new file mode 100644
index 000000000000..62fabb857aa3
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-10-25-21-14-18.bpo-42150.b70u_T.rst	
@@ -0,0 +1,2 @@
+Fix possible buffer overflow in the new parser when checking for
+continuation lines. Patch by Pablo Galindo.
diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
index 2c435fb36783..a7643fc3a6ad 100644
--- a/Parser/pegen/pegen.c
+++ b/Parser/pegen/pegen.c
@@ -989,7 +989,8 @@ bad_single_statement(Parser *p)
 
     /* Newlines are allowed if preceded by a line continuation character
        or if they appear inside a string. */
-    if (!cur || *(cur - 1) == '\\' || newline_in_string(p, cur)) {
+    if (!cur || (cur != p->tok->buf && *(cur - 1) == '\\')
+             || newline_in_string(p, cur)) {
         return 0;
     }
     char c = *cur;