Issue #5918: Fix a crash in the parser module.
Patch by Amaury.
diff --git a/Misc/NEWS b/Misc/NEWS
index 58f381b..109297e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 12b7fc3..a4a6416 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -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)));