commit 54f115dd533653c43b3c5541bf5936b22e484474
author Pablo Galindo <Pablogsal@gmail.com> Mon Jul 06 20:29:59 2020 +0100
committer GitHub <noreply@github.com> Mon Jul 06 12:29:59 2020 -0700
tree 9fec888a0615b0de6fe7c25276f432a92ba42a69
parent 4981fe36c7477303de830e8dca929a02caaaffe4

[3.9] bpo-41215: Don't use NULL by default in the PEG parser keyword list (GH-21355) (GH-21356)



(cherry picked from commit 39e76c0fb07e20acad454deb86a0457b279884a9)

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

Automerge-Triggered-By: @lysnikolaou

Parser/pegen/pegen.c

diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c
index 895677b..0f33dcb 100644
--- a/Parser/pegen/pegen.c
+++ b/Parser/pegen/pegen.c
@@ -525,10 +525,13 @@
 static int
 _get_keyword_or_name_type(Parser *p, const char *name, int name_len)
 {
-    if (name_len >= p->n_keyword_lists || p->keywords[name_len] == NULL) {
+    assert(name_len != 0);
+    if (name_len >= p->n_keyword_lists ||
+        p->keywords[name_len] == NULL ||
+        p->keywords[name_len]->type == -1) {
         return NAME;
     }
-    for (KeywordToken *k = p->keywords[name_len]; k->type != -1; k++) {
+    for (KeywordToken *k = p->keywords[name_len]; k != NULL && k->type != -1; k++) {
         if (strncmp(k->str, name, name_len) == 0) {
             return k->type;
         }