traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#3117: backport r55087, fixes segfault with lambda (None,): None.

This commit is contained in:
Georg Brandl 2008-06-15 19:53:12 +00:00
parent 7eb4a82182
commit d297f1ad78
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_grammar.py
View File

@ -277,6 +277,7 @@ l5 = lambda x, y, z=2: x + y + z
verify(l5(1, 2) == 5) verify(l5(1, 2) == 5)
verify(l5(1, 2, 3) == 6) verify(l5(1, 2, 3) == 6)
check_syntax("lambda x: x = 2") check_syntax("lambda x: x = 2")
check_syntax("lambda (None,): None")
### stmt: simple_stmt | compound_stmt ### stmt: simple_stmt | compound_stmt
# Tested below # Tested below

4
Python/ast.c
View File

@ -249,6 +249,8 @@ PyAST_FromNode(const node *n, PyCompilerFlags *flags, const char *filename,
goto error; goto error;
asdl_seq_SET(stmts, 0, Pass(n->n_lineno, n->n_col_offset, asdl_seq_SET(stmts, 0, Pass(n->n_lineno, n->n_col_offset,
arena)); arena));
if (!asdl_seq_GET(stmts, 0))
goto error;
return Interactive(stmts, arena); return Interactive(stmts, arena);
} }
else { else {
@ -679,6 +681,8 @@ ast_for_arguments(struct compiling *c, const node *n)
if (NCH(ch) != 1) { if (NCH(ch) != 1) {
/* We have complex arguments, setup for unpacking. */ /* We have complex arguments, setup for unpacking. */
asdl_seq_SET(args, k++, compiler_complex_args(c, ch)); asdl_seq_SET(args, k++, compiler_complex_args(c, ch));
if (!asdl_seq_GET(args, k-1))
goto error;
} else { } else {
/* def foo((x)): setup for checking NAME below. */ /* def foo((x)): setup for checking NAME below. */
/* Loop because there can be many parens and tuple /* Loop because there can be many parens and tuple