commit 64409117361499058b1bf95e6efec31f7bb3c0d0
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sun Jun 07 18:08:53 2020 -0700
committer GitHub <noreply@github.com> Sun Jun 07 18:08:53 2020 -0700
tree a0ce15928486f3a6679b1fe40be11496f12e7db8
parent 71f501698d64af6463246bc6efdbbf1b85616102

bpo-40904: Fix segfault in the new parser with f-string containing yield statements with no value (GH-20701)

(cherry picked from commit 972ab0327675e695373fc6272d5ac24e187579ad)

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

Parser/pegen/parse_string.c

diff --git a/Parser/pegen/parse_string.c b/Parser/pegen/parse_string.c
index efe82df..94241e1 100644
--- a/Parser/pegen/parse_string.c
+++ b/Parser/pegen/parse_string.c
@@ -278,6 +278,9 @@
 
 
 static inline void shift_expr(expr_ty parent, expr_ty n, int line, int col) {
+    if (n == NULL) {
+        return;
+    }
     if (parent->lineno < n->lineno) {
         col = 0;
     }