From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 14 May 2009 21:48:09 +0000 (+0000)
Subject: Issue #5918: Fix a crash in the parser module.
X-Git-Tag: v2.7a1~1192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42b5bcf048b274c7fdbb9fbabdb9f6f856031d08;p=python

Issue #5918: Fix a crash in the parser module.

Patch by Amaury.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 58f381b45d..109297ec8a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -293,6 +293,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #5918: Fix a crash in the parser module.
+
 - Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr.
 
 - Issue #6022: a test file was created in the current working directory by
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 12b7fc3c5b..a4a641662f 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2092,14 +2092,14 @@ validate_try(node *tree)
         return (res);
     }
     /* try/except statement: skip past except_clause sections */
-    while (res && (TYPE(CHILD(tree, pos)) == except_clause)) {
+    while (res && pos < nch && (TYPE(CHILD(tree, pos)) == except_clause)) {
         res = (validate_except_clause(CHILD(tree, pos))
                && validate_colon(CHILD(tree, pos + 1))
                && validate_suite(CHILD(tree, pos + 2)));
         pos += 3;
     }
     /* skip else clause */
-    if (res && (TYPE(CHILD(tree, pos)) == NAME) &&
+    if (res && pos < nch && (TYPE(CHILD(tree, pos)) == NAME) &&
         (strcmp(STR(CHILD(tree, pos)), "else") == 0)) {
         res = (validate_colon(CHILD(tree, pos + 1))
                && validate_suite(CHILD(tree, pos + 2)));