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

Merged revisions 84209 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84209 | amaury.forgeotdarc | 2010-08-19 19:43:15 +0200 (jeu., 19 août 2010) | 5 lines

  Check the return values for all functions returning an ast node.
  Failure to do it may result in strange error messages or even crashes,
  in admittedly convoluted cases that are normally syntax errors, like:
      def f(*xx, __debug__): pass
........
This commit is contained in:
Amaury Forgeot d'Arc 2010-08-19 20:26:00 +00:00
parent cb39d6c4e2
commit fc34ac5fdd
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Python/ast.c
View File

@ -673,6 +673,8 @@ handle_keywordonly_args(struct compiling *c, const node *n, int start,
case tfpdef: case tfpdef:
if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) { if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
expression = ast_for_expr(c, CHILD(n, i + 2)); expression = ast_for_expr(c, CHILD(n, i + 2));
if (!expression)
goto error;
asdl_seq_SET(kwdefaults, j, expression); asdl_seq_SET(kwdefaults, j, expression);
i += 2; /* '=' and test */ i += 2; /* '=' and test */
} }
@ -682,10 +684,8 @@ handle_keywordonly_args(struct compiling *c, const node *n, int start,
if (NCH(ch) == 3) { if (NCH(ch) == 3) {
/* ch is NAME ':' test */ /* ch is NAME ':' test */
annotation = ast_for_expr(c, CHILD(ch, 2)); annotation = ast_for_expr(c, CHILD(ch, 2));
if (!annotation) { if (!annotation)
ast_error(ch, "expected expression");
goto error; goto error;
}
} }
else { else {
annotation = NULL; annotation = NULL;
@ -777,22 +777,22 @@ ast_for_arguments(struct compiling *c, const node *n)
} }
posargs = (nposargs ? asdl_seq_new(nposargs, c->c_arena) : NULL); posargs = (nposargs ? asdl_seq_new(nposargs, c->c_arena) : NULL);
if (!posargs && nposargs) if (!posargs && nposargs)
goto error; return NULL;
kwonlyargs = (nkwonlyargs ? kwonlyargs = (nkwonlyargs ?
asdl_seq_new(nkwonlyargs, c->c_arena) : NULL); asdl_seq_new(nkwonlyargs, c->c_arena) : NULL);
if (!kwonlyargs && nkwonlyargs) if (!kwonlyargs && nkwonlyargs)
goto error; return NULL;
posdefaults = (nposdefaults ? posdefaults = (nposdefaults ?
asdl_seq_new(nposdefaults, c->c_arena) : NULL); asdl_seq_new(nposdefaults, c->c_arena) : NULL);
if (!posdefaults && nposdefaults) if (!posdefaults && nposdefaults)
goto error; return NULL;
/* The length of kwonlyargs and kwdefaults are same /* The length of kwonlyargs and kwdefaults are same
since we set NULL as default for keyword only argument w/o default since we set NULL as default for keyword only argument w/o default
- we have sequence data structure, but no dictionary */ - we have sequence data structure, but no dictionary */
kwdefaults = (nkwonlyargs ? kwdefaults = (nkwonlyargs ?
asdl_seq_new(nkwonlyargs, c->c_arena) : NULL); asdl_seq_new(nkwonlyargs, c->c_arena) : NULL);
if (!kwdefaults && nkwonlyargs) if (!kwdefaults && nkwonlyargs)
goto error; return NULL;
if (nposargs + nkwonlyargs > 255) { if (nposargs + nkwonlyargs > 255) {
ast_error(n, "more than 255 arguments"); ast_error(n, "more than 255 arguments");
@ -816,7 +816,7 @@ ast_for_arguments(struct compiling *c, const node *n)
if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) { if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
expr_ty expression = ast_for_expr(c, CHILD(n, i + 2)); expr_ty expression = ast_for_expr(c, CHILD(n, i + 2));
if (!expression) if (!expression)
goto error; return NULL;
assert(posdefaults != NULL); assert(posdefaults != NULL);
asdl_seq_SET(posdefaults, j++, expression); asdl_seq_SET(posdefaults, j++, expression);
i += 2; i += 2;
@ -825,11 +825,11 @@ ast_for_arguments(struct compiling *c, const node *n)
else if (found_default) { else if (found_default) {
ast_error(n, ast_error(n,
"non-default argument follows default argument"); "non-default argument follows default argument");
goto error; return NULL;
} }
arg = compiler_arg(c, ch); arg = compiler_arg(c, ch);
if (!arg) if (!arg)
goto error; return NULL;
asdl_seq_SET(posargs, k++, arg); asdl_seq_SET(posargs, k++, arg);
i += 2; /* the name and the comma */ i += 2; /* the name and the comma */
break; break;
@ -837,7 +837,7 @@ ast_for_arguments(struct compiling *c, const node *n)
if (i+1 >= NCH(n)) { if (i+1 >= NCH(n)) {
ast_error(CHILD(n, i), ast_error(CHILD(n, i),
"named arguments must follow bare *"); "named arguments must follow bare *");
goto error; return NULL;
} }
ch = CHILD(n, i+1); /* tfpdef or COMMA */ ch = CHILD(n, i+1); /* tfpdef or COMMA */
if (TYPE(ch) == COMMA) { if (TYPE(ch) == COMMA) {
@ -845,7 +845,7 @@ ast_for_arguments(struct compiling *c, const node *n)
i += 2; /* now follows keyword only arguments */ i += 2; /* now follows keyword only arguments */
res = handle_keywordonly_args(c, n, i, res = handle_keywordonly_args(c, n, i,
kwonlyargs, kwdefaults); kwonlyargs, kwdefaults);
if (res == -1) goto error; if (res == -1) return NULL;
i = res; /* res has new position to process */ i = res; /* res has new position to process */
} }
else { else {
@ -855,6 +855,8 @@ ast_for_arguments(struct compiling *c, const node *n)
if (NCH(ch) > 1) { if (NCH(ch) > 1) {
/* there is an annotation on the vararg */ /* there is an annotation on the vararg */
varargannotation = ast_for_expr(c, CHILD(ch, 2)); varargannotation = ast_for_expr(c, CHILD(ch, 2));
if (!varargannotation)
return NULL;
} }
i += 3; i += 3;
if (i < NCH(n) && (TYPE(CHILD(n, i)) == tfpdef if (i < NCH(n) && (TYPE(CHILD(n, i)) == tfpdef
@ -862,7 +864,7 @@ ast_for_arguments(struct compiling *c, const node *n)
int res = 0; int res = 0;
res = handle_keywordonly_args(c, n, i, res = handle_keywordonly_args(c, n, i,
kwonlyargs, kwdefaults); kwonlyargs, kwdefaults);
if (res == -1) goto error; if (res == -1) return NULL;
i = res; /* res has new position to process */ i = res; /* res has new position to process */
} }
} }
@ -874,24 +876,22 @@ ast_for_arguments(struct compiling *c, const node *n)
if (NCH(ch) > 1) { if (NCH(ch) > 1) {
/* there is an annotation on the kwarg */ /* there is an annotation on the kwarg */
kwargannotation = ast_for_expr(c, CHILD(ch, 2)); kwargannotation = ast_for_expr(c, CHILD(ch, 2));
if (!kwargannotation)
return NULL;
} }
if (!kwarg) if (!kwarg)
goto error; return NULL;
i += 3; i += 3;
break; break;
default: default:
PyErr_Format(PyExc_SystemError, PyErr_Format(PyExc_SystemError,
"unexpected node in varargslist: %d @ %d", "unexpected node in varargslist: %d @ %d",
TYPE(ch), i); TYPE(ch), i);
goto error; return NULL;
} }
} }
return arguments(posargs, vararg, varargannotation, kwonlyargs, kwarg, return arguments(posargs, vararg, varargannotation, kwonlyargs, kwarg,
kwargannotation, posdefaults, kwdefaults, c->c_arena); kwargannotation, posdefaults, kwdefaults, c->c_arena);
error:
Py_XDECREF(vararg);
Py_XDECREF(kwarg);
return NULL;
} }
static expr_ty static expr_ty
@ -976,9 +976,9 @@ ast_for_decorators(struct compiling *c, const node *n)
for (i = 0; i < NCH(n); i++) { for (i = 0; i < NCH(n); i++) {
d = ast_for_decorator(c, CHILD(n, i)); d = ast_for_decorator(c, CHILD(n, i));
if (!d) if (!d)
return NULL; return NULL;
asdl_seq_SET(decorator_seq, i, d); asdl_seq_SET(decorator_seq, i, d);
} }
return decorator_seq; return decorator_seq;
} }
@ -1004,7 +1004,7 @@ ast_for_funcdef(struct compiling *c, const node *n, asdl_seq *decorator_seq)
if (TYPE(CHILD(n, name_i+2)) == RARROW) { if (TYPE(CHILD(n, name_i+2)) == RARROW) {
returns = ast_for_expr(c, CHILD(n, name_i + 3)); returns = ast_for_expr(c, CHILD(n, name_i + 3));
if (!returns) if (!returns)
return NULL; return NULL;
name_i += 2; name_i += 2;
} }
body = ast_for_suite(c, CHILD(n, name_i + 3)); body = ast_for_suite(c, CHILD(n, name_i + 3));
@ -2152,11 +2152,10 @@ ast_for_expr_stmt(struct compiling *c, const node *n)
return NULL; return NULL;
} }
e = ast_for_testlist(c, ch); e = ast_for_testlist(c, ch);
/* set context to assign */
if (!e) if (!e)
return NULL; return NULL;
/* set context to assign */
if (!set_context(c, e, Store, CHILD(n, i))) if (!set_context(c, e, Store, CHILD(n, i)))
return NULL; return NULL;
@ -2957,6 +2956,8 @@ ast_for_with_item(struct compiling *c, const node *n, asdl_seq *content)
REQ(n, with_item); REQ(n, with_item);
context_expr = ast_for_expr(c, CHILD(n, 0)); context_expr = ast_for_expr(c, CHILD(n, 0));
if (!context_expr)
return NULL;
if (NCH(n) == 3) { if (NCH(n) == 3) {
optional_vars = ast_for_expr(c, CHILD(n, 2)); optional_vars = ast_for_expr(c, CHILD(n, 2));