From: Georg Brandl <georg@python.org>
Date: Wed, 19 May 2010 00:07:47 +0000 (+0000)
Subject: Merged revisions 72645 via svnmerge from
X-Git-Tag: v2.6.6rc1~299
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f72cae4afa3f6f60e20401c2c02bf6411d761774;p=thirdparty%2FPython%2Fcpython.git

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

........
  r72645 | antoine.pitrou | 2009-05-14 21:48:09 +0000 (Do, 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 09ab65eae9f8..ee4bf2b78754 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #5918: Fix a crash in the parser module.
+
 - Issue #8688: Distutils now recalculates MANIFEST everytime.
 
 - Issue #7640: In the new `io` module, fix relative seek() for buffered
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 0dd69cda1a4f..425d97f6bfad 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)));