Issue #9130: Fix validation of relative imports in parser module.
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index e60f23d..bead663 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -1767,8 +1767,8 @@
return i-1;
}
-/* 'from' ('.'* dotted_name | '.') 'import' ('*' | '(' import_as_names ')' |
- * import_as_names
+/* import_from: ('from' ('.'* dotted_name | '.'+)
+ * 'import' ('*' | '(' import_as_names ')' | import_as_names))
*/
static int
validate_import_from(node *tree)
@@ -1778,7 +1778,8 @@
int havename = (TYPE(CHILD(tree, ndots + 1)) == dotted_name);
int offset = ndots + havename;
int res = validate_ntype(tree, import_from)
- && (nch >= 4 + ndots)
+ && (offset >= 1)
+ && (nch >= 3 + offset)
&& validate_name(CHILD(tree, 0), "from")
&& (!havename || validate_dotted_name(CHILD(tree, ndots + 1)))
&& validate_name(CHILD(tree, offset + 1), "import");