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. ........
This commit is contained in:
parent
4605aa2a09
commit
f72cae4afa
|
@ -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
|
||||
|
|
|
@ -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)));
|
||||
|
|
Loading…
Reference in New Issue