mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 08:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 72645 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Georg Brandl 2010-05-19 00:07:47 +00:00
parent 4605aa2a09
commit f72cae4afa
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -44,6 +44,8 @@ Core and Builtins
Library Library
------- -------
- Issue #5918: Fix a crash in the parser module.
- Issue #8688: Distutils now recalculates MANIFEST everytime. - Issue #8688: Distutils now recalculates MANIFEST everytime.
- Issue #7640: In the new `io` module, fix relative seek() for buffered - Issue #7640: In the new `io` module, fix relative seek() for buffered

4
Modules/parsermodule.c
View file

@ -2092,14 +2092,14 @@ validate_try(node *tree)
return (res); return (res);
} }
/* try/except statement: skip past except_clause sections */ /* 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)) res = (validate_except_clause(CHILD(tree, pos))
&& validate_colon(CHILD(tree, pos + 1)) && validate_colon(CHILD(tree, pos + 1))
&& validate_suite(CHILD(tree, pos + 2))); && validate_suite(CHILD(tree, pos + 2)));
pos += 3; pos += 3;
} }
/* skip else clause */ /* 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)) { (strcmp(STR(CHILD(tree, pos)), "else") == 0)) {
res = (validate_colon(CHILD(tree, pos + 1)) res = (validate_colon(CHILD(tree, pos + 1))
&& validate_suite(CHILD(tree, pos + 2))); && validate_suite(CHILD(tree, pos + 2)));