From 6b7b108e848e9654ac8efcccdefc78e2df083c75 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Thu, 19 Aug 2010 21:35:59 +0000 Subject: Merged revisions 84214 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r84214 | amaury.forgeotdarc | 2010-08-19 23:32:38 +0200 (jeu., 19 août 2010) | 3 lines Add tests for r84209 (crashes in the Ast builder) Also remove one tab, and move a check closer to the possible failure. ........ --- Python/ast.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Python/ast.c') diff --git a/Python/ast.c b/Python/ast.c index 2f974c0eba..5c17133fc9 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -674,7 +674,7 @@ handle_keywordonly_args(struct compiling *c, const node *n, int start, if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) { expression = ast_for_expr(c, CHILD(n, i + 2)); if (!expression) - goto error; + goto error; asdl_seq_SET(kwdefaults, j, expression); i += 2; /* '=' and test */ } @@ -873,14 +873,14 @@ ast_for_arguments(struct compiling *c, const node *n) ch = CHILD(n, i+1); /* tfpdef */ assert(TYPE(ch) == tfpdef || TYPE(ch) == vfpdef); kwarg = NEW_IDENTIFIER(CHILD(ch, 0)); + if (!kwarg) + return NULL; if (NCH(ch) > 1) { /* there is an annotation on the kwarg */ kwargannotation = ast_for_expr(c, CHILD(ch, 2)); if (!kwargannotation) return NULL; } - if (!kwarg) - return NULL; i += 3; break; default: -- cgit v1.2.1