[Python-checkins] r72645 - in python/trunk: Misc/NEWS Modules/parsermodule.c

Thu May 14 23:48:10 CEST 2009

Author: antoine.pitrou
Date: Thu May 14 23:48:09 2009
New Revision: 72645
Log:
Issue #5918: Fix a crash in the parser module.
Patch by Amaury.
Modified:
 python/trunk/Misc/NEWS
 python/trunk/Modules/parsermodule.c
Modified: python/trunk/Misc/NEWS
==============================================================================

--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu May 14 23:48:09 2009
@@ -293,6 +293,8 @@
 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
Modified: python/trunk/Modules/parsermodule.c
==============================================================================
--- python/trunk/Modules/parsermodule.c	(original)
+++ python/trunk/Modules/parsermodule.c	Thu May 14 23:48:09 2009
@@ -2092,14 +2092,14 @@
 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)));
