bpo-40880: Fix invalid read in newline_in_string in pegen.c (GH-20666)

miss-islington · pablogsal · web-flow · commit 15fec5627ac3 · 2020-06-05T17:13:14.000-07:00
* bpo-40880: Fix invalid read in newline_in_string in pegen.c * Update Parser/pegen/pegen.c Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com> * Add NEWS entry Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com> (cherry picked from commit 2e6593d) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-06-06-00-23-19.bpo-40880.fjdzSh.rst b/Misc/NEWS.d/next/Core and Builtins/2020-06-06-00-23-19.bpo-40880.fjdzSh.rst
@@ -0,0 +1,2 @@
+Fix invalid memory read in the new parser when checking newlines in string
+literals. Patch by Pablo Galindo.
diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
@@ -936,8 +936,8 @@ _PyPegen_number_token(Parser *p)
 static int // bool
 newline_in_string(Parser *p, const char *cur)
 {
-    for (char c = *cur; cur >= p->tok->buf; c = *--cur) {
-        if (c == '\'' || c == '"') {
+    for (const char *c = cur; c >= p->tok->buf; c--) {
+        if (*c == '\'' || *c == '"') {
             return 1;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix invalid memory read in the new parser when checking newlines in string`
	`2`	`+literals. Patch by Pablo Galindo.`
Original file line number	Diff line number	Diff line change
`@@ -936,8 +936,8 @@ _PyPegen_number_token(Parser *p)`
`936`	`936`	`static int // bool`
`937`	`937`	`newline_in_string(Parser p, const char cur)`
`938`	`938`	`{`
`939`		`- for (char c = cur; cur >= p->tok->buf; c = --cur) {`
`940`		`- if (c == '\'' \|\| c == '"') {`
	`939`	`+ for (const char *c = cur; c >= p->tok->buf; c--) {`
	`940`	`+ if (c == '\'' \|\| c == '"') {`
`941`	`941`	`return 1;`
`942`	`942`	`}`
`943`	`943`	`}`