From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 14 May 2009 21:54:00 +0000 (+0000)
Subject: Merged revisions 72645 via svnmerge from
X-Git-Tag: v3.1rc1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37d1c18bda0e1596c465c75f8fe928400899399a;p=python

Merged revisions 72645 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72645 | antoine.pitrou | 2009-05-14 23:48:09 +0200 (jeu., 14 mai 2009) | 6 lines

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

  Patch by Amaury.
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0c28db0685..9173a72e0d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,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 #5006: Better handling of unicode byte-order marks (BOM) in the io
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 38ec65ee85..49f6e23c41 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -1943,14 +1943,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)));