Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 06:01:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 67373 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67373 | benjamin.peterson | 2008-11-24 21:43:14 -0600 (Mon, 24 Nov 2008) | 2 lines

  always check the return value of NEW_IDENTIFIER
........
This commit is contained in:
Benjamin Peterson 2008-11-25 04:02:28 +00:00
parent 64903f9ed9
commit 307600603d
1 changed files with 47 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Python/ast.c
View file

@ -51,6 +51,8 @@ static identifier
new_identifier(const char* n, PyArena *arena) new_identifier(const char* n, PyArena *arena)
{ {
PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL); PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
if (!id)
return NULL;
Py_UNICODE *u = PyUnicode_AS_UNICODE(id); Py_UNICODE *u = PyUnicode_AS_UNICODE(id);
/* Check whether there are non-ASCII characters in the /* Check whether there are non-ASCII characters in the
identifier; if so, normalize to NFKC. */ identifier; if so, normalize to NFKC. */
@ -826,7 +828,6 @@ ast_for_arguments(struct compiling *c, const node *n)
if (!arg) if (!arg)
goto error; goto error;
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;
case STAR: case STAR:
@ -846,6 +847,8 @@ ast_for_arguments(struct compiling *c, const node *n)
} }
else { else {
vararg = NEW_IDENTIFIER(CHILD(ch, 0)); vararg = NEW_IDENTIFIER(CHILD(ch, 0));
if (!vararg)
return NULL;
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));
@ -869,6 +872,8 @@ ast_for_arguments(struct compiling *c, const node *n)
/* 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 (!kwarg)
goto error;
i += 3; i += 3;
break; break;
default: default:
@ -1311,10 +1316,14 @@ ast_for_atom(struct compiling *c, const node *n)
int bytesmode = 0; int bytesmode = 0;
switch (TYPE(ch)) { switch (TYPE(ch)) {
case NAME: case NAME: {
/* All names start in Load context, but may later be /* All names start in Load context, but may later be
changed. */ changed. */
return Name(NEW_IDENTIFIER(ch), Load, LINENO(n), n->n_col_offset, c->c_arena); PyObject *name = NEW_IDENTIFIER(ch);
if (!name)
return NULL;
return Name(name, Load, LINENO(n), n->n_col_offset, c->c_arena);
}
case STRING: { case STRING: {
PyObject *str = parsestrplus(c, n, &bytesmode); PyObject *str = parsestrplus(c, n, &bytesmode);
if (!str) { if (!str) {
@ -1589,7 +1598,10 @@ ast_for_trailer(struct compiling *c, const node *n, expr_ty left_expr)
return ast_for_call(c, CHILD(n, 1), left_expr); return ast_for_call(c, CHILD(n, 1), left_expr);
} }
else if (TYPE(CHILD(n, 0)) == DOT ) { else if (TYPE(CHILD(n, 0)) == DOT ) {
return Attribute(left_expr, NEW_IDENTIFIER(CHILD(n, 1)), Load, PyObject *attr_id = NEW_IDENTIFIER(CHILD(n, 1));
if (!attr_id)
return NULL;
return Attribute(left_expr, attr_id, Load,
LINENO(n), n->n_col_offset, c->c_arena); LINENO(n), n->n_col_offset, c->c_arena);
} }
else { else {
@ -2275,7 +2287,7 @@ alias_for_import_name(struct compiling *c, const node *n)
dotted_as_name: dotted_name ['as' NAME] dotted_as_name: dotted_name ['as' NAME]
dotted_name: NAME ('.' NAME)* dotted_name: NAME ('.' NAME)*
*/ */
PyObject *str; PyObject *str, *name;
loop: loop:
switch (TYPE(n)) { switch (TYPE(n)) {
@ -2283,8 +2295,13 @@ alias_for_import_name(struct compiling *c, const node *n)
str = NULL; str = NULL;
if (NCH(n) == 3) { if (NCH(n) == 3) {
str = NEW_IDENTIFIER(CHILD(n, 2)); str = NEW_IDENTIFIER(CHILD(n, 2));
if (!str)
return NULL;
} }
return alias(NEW_IDENTIFIER(CHILD(n, 0)), str, c->c_arena); name = NEW_IDENTIFIER(CHILD(n, 0));
if (!name)
return NULL;
return alias(name, str, c->c_arena);
case dotted_as_name: case dotted_as_name:
if (NCH(n) == 1) { if (NCH(n) == 1) {
n = CHILD(n, 0); n = CHILD(n, 0);
@ -2296,12 +2313,18 @@ alias_for_import_name(struct compiling *c, const node *n)
return NULL; return NULL;
assert(!a->asname); assert(!a->asname);
a->asname = NEW_IDENTIFIER(CHILD(n, 2)); a->asname = NEW_IDENTIFIER(CHILD(n, 2));
if (!a->asname)
return NULL;
return a; return a;
} }
break; break;
case dotted_name: case dotted_name:
if (NCH(n) == 1) if (NCH(n) == 1) {
return alias(NEW_IDENTIFIER(CHILD(n, 0)), NULL, c->c_arena); name = NEW_IDENTIFIER(CHILD(n, 0));
if (!name)
return NULL;
return alias(name, NULL, c->c_arena);
}
else { else {
/* Create a string of the form "a.b.c" */ /* Create a string of the form "a.b.c" */
int i; int i;
@ -2974,6 +2997,7 @@ static stmt_ty
ast_for_classdef(struct compiling *c, const node *n, asdl_seq *decorator_seq) ast_for_classdef(struct compiling *c, const node *n, asdl_seq *decorator_seq)
{ {
/* classdef: 'class' NAME ['(' arglist ')'] ':' suite */ /* classdef: 'class' NAME ['(' arglist ')'] ':' suite */
PyObject *classname;
asdl_seq *s; asdl_seq *s;
expr_ty call, dummy; expr_ty call, dummy;
@ -2983,16 +3007,22 @@ ast_for_classdef(struct compiling *c, const node *n, asdl_seq *decorator_seq)
s = ast_for_suite(c, CHILD(n, 3)); s = ast_for_suite(c, CHILD(n, 3));
if (!s) if (!s)
return NULL; return NULL;
return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), NULL, NULL, NULL, NULL, s, classname = NEW_IDENTIFIER(CHILD(n, 1));
decorator_seq, LINENO(n), n->n_col_offset, c->c_arena); if (!classname)
return NULL;
return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
LINENO(n), n->n_col_offset, c->c_arena);
} }
if (TYPE(CHILD(n, 3)) == RPAR) { /* class NAME '(' ')' ':' suite */ if (TYPE(CHILD(n, 3)) == RPAR) { /* class NAME '(' ')' ':' suite */
s = ast_for_suite(c, CHILD(n,5)); s = ast_for_suite(c, CHILD(n,5));
if (!s) if (!s)
return NULL; return NULL;
return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), NULL, NULL, NULL, NULL, s, classname = NEW_IDENTIFIER(CHILD(n, 1));
decorator_seq, LINENO(n), n->n_col_offset, c->c_arena); if (!classname)
return NULL;
return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
LINENO(n), n->n_col_offset, c->c_arena);
} }
/* class NAME '(' arglist ')' ':' suite */ /* class NAME '(' arglist ')' ':' suite */
@ -3004,9 +3034,11 @@ ast_for_classdef(struct compiling *c, const node *n, asdl_seq *decorator_seq)
s = ast_for_suite(c, CHILD(n, 6)); s = ast_for_suite(c, CHILD(n, 6));
if (!s) if (!s)
return NULL; return NULL;
classname = NEW_IDENTIFIER(CHILD(n, 1));
if (!classname)
return NULL;
return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), return ClassDef(classname, call->v.Call.args, call->v.Call.keywords,
call->v.Call.args, call->v.Call.keywords,
call->v.Call.starargs, call->v.Call.kwargs, s, call->v.Call.starargs, call->v.Call.kwargs, s,
decorator_seq, LINENO(n), n->n_col_offset, c->c_arena); decorator_seq, LINENO(n), n->n_col_offset, c->c_arena);
} }