From: Brad Larsen <brad@bradfordlarsen.com>
Date: Mon, 1 Apr 2019 14:36:05 +0000 (-0400)
Subject: bpo-36495: Fix two out-of-bounds array reads (GH-12641)
X-Git-Tag: v3.8.0a4~279
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4d78362397fc3bced6ea80fbc7b5f4827aec55e;p=python

bpo-36495: Fix two out-of-bounds array reads (GH-12641)

Research and fix by @bradlarsen.
---

diff --git a/Python/ast.c b/Python/ast.c
index e9154fecff..913e53ad79 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1400,7 +1400,7 @@ handle_keywordonly_args(struct compiling *c, const node *n, int start,
                     goto error;
                 asdl_seq_SET(kwonlyargs, j++, arg);
                 i += 1; /* the name */
-                if (TYPE(CHILD(n, i)) == COMMA)
+                if (i < NCH(n) && TYPE(CHILD(n, i)) == COMMA)
                     i += 1; /* the comma, if present */
                 break;
             case TYPE_COMMENT:
@@ -1599,7 +1599,7 @@ ast_for_arguments(struct compiling *c, const node *n)
                 if (!kwarg)
                     return NULL;
                 i += 2; /* the double star and the name */
-                if (TYPE(CHILD(n, i)) == COMMA)
+                if (i < NCH(n) && TYPE(CHILD(n, i)) == COMMA)
                     i += 1; /* the comma, if present */
                 break;
             case TYPE_COMMENT: