Skip to content

bpo-33132: Fix reference counting issues in the compiler. #6209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Mar 24, 2018
Merged

bpo-33132: Fix reference counting issues in the compiler. #6209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2909,9 +2909,7 @@ static int
compiler_from_import(struct compiler *c, stmt_ty s)
{
Py_ssize_t i, n = asdl_seq_LEN(s->v.ImportFrom.names);

PyObject *names = PyTuple_New(n);
PyObject *level;
PyObject *level, *names;
static PyObject *empty_string;

if (!empty_string) {
Expand All @@ -2920,14 +2918,15 @@ compiler_from_import(struct compiler *c, stmt_ty s)
return 0;
}

if (!names)
return 0;

level = PyLong_FromLong(s->v.ImportFrom.level);
if (!level) {
Py_DECREF(names);
return 0;
}
ADDOP_N(c, LOAD_CONST, level, consts);

names = PyTuple_New(n);
if (!names)
return 0;

/* build up the names */
for (i = 0; i < n; i++) {
Expand All @@ -2938,16 +2937,12 @@ compiler_from_import(struct compiler *c, stmt_ty s)

if (s->lineno > c->c_future->ff_lineno && s->v.ImportFrom.module &&
_PyUnicode_EqualToASCIIString(s->v.ImportFrom.module, "__future__")) {
Py_DECREF(level);
Py_DECREF(names);
return compiler_error(c, "from __future__ imports must occur "
"at the beginning of the file");
}
ADDOP_N(c, LOAD_CONST, names, consts);

ADDOP_O(c, LOAD_CONST, level, consts);
Py_DECREF(level);
ADDOP_O(c, LOAD_CONST, names, consts);
Py_DECREF(names);
if (s->v.ImportFrom.module) {
ADDOP_NAME(c, IMPORT_NAME, s->v.ImportFrom.module, names);
}
Expand All @@ -2970,7 +2965,6 @@ compiler_from_import(struct compiler *c, stmt_ty s)
store_name = alias->asname;

if (!compiler_nameop(c, store_name, Store)) {
Py_DECREF(names);
return 0;
}
}
Expand Down Expand Up @@ -4739,19 +4733,18 @@ compiler_annassign(struct compiler *c, stmt_ty s)
if (s->v.AnnAssign.simple &&
(c->u->u_scope_type == COMPILER_SCOPE_MODULE ||
c->u->u_scope_type == COMPILER_SCOPE_CLASS)) {
mangled = _Py_Mangle(c->u->u_private, targ->v.Name.id);
if (!mangled) {
return 0;
}
if (c->c_future->ff_features & CO_FUTURE_ANNOTATIONS) {
VISIT(c, annexpr, s->v.AnnAssign.annotation)
}
else {
VISIT(c, expr, s->v.AnnAssign.annotation);
}
ADDOP_NAME(c, LOAD_NAME, __annotations__, names);
ADDOP_O(c, LOAD_CONST, mangled, consts);
Py_DECREF(mangled);
mangled = _Py_Mangle(c->u->u_private, targ->v.Name.id);
if (!mangled) {
return 0;
}
ADDOP_N(c, LOAD_CONST, mangled, consts);
ADDOP(c, STORE_SUBSCR);
}
break;
Expand Down