1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-42246: Fix memory leak in compiler (GH-23256)

Browse Source 
* Fix potential memory leak in assembler init.

* Fix reference leak when encountering error during compilation of function body.
This commit is contained in:
Mark Shannon 2020-11-13 12:53:53 +00:00 committed by GitHub
parent cc75ab791d
commit fd009e606a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Python/compile.c
View File

@ -2276,7 +2276,7 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async)
c->u->u_posonlyargcount = asdl_seq_LEN(args->posonlyargs); c->u->u_posonlyargcount = asdl_seq_LEN(args->posonlyargs);
c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs); c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
for (i = docstring ? 1 : 0; i < asdl_seq_LEN(body); i++) { for (i = docstring ? 1 : 0; i < asdl_seq_LEN(body); i++) {
VISIT(c, stmt, (stmt_ty)asdl_seq_GET(body, i)); VISIT_IN_SCOPE(c, stmt, (stmt_ty)asdl_seq_GET(body, i));
} }
co = assemble(c, 1); co = assemble(c, 1);
qualname = c->u->u_qualname; qualname = c->u->u_qualname;
@ -5533,18 +5533,24 @@ assemble_init(struct assembler *a, int nblocks, int firstlineno)
{ {
memset(a, 0, sizeof(struct assembler)); memset(a, 0, sizeof(struct assembler));
a->a_prevlineno = a->a_lineno = firstlineno; a->a_prevlineno = a->a_lineno = firstlineno;
a->a_lnotab = NULL;
a->a_bytecode = PyBytes_FromStringAndSize(NULL, DEFAULT_CODE_SIZE); a->a_bytecode = PyBytes_FromStringAndSize(NULL, DEFAULT_CODE_SIZE);
if (!a->a_bytecode) if (a->a_bytecode == NULL) {
return 0; goto error;
}
a->a_lnotab = PyBytes_FromStringAndSize(NULL, DEFAULT_LNOTAB_SIZE); a->a_lnotab = PyBytes_FromStringAndSize(NULL, DEFAULT_LNOTAB_SIZE);
if (!a->a_lnotab) if (a->a_lnotab == NULL) {
return 0; goto error;
}
if ((size_t)nblocks > SIZE_MAX / sizeof(basicblock *)) { if ((size_t)nblocks > SIZE_MAX / sizeof(basicblock *)) {
PyErr_NoMemory(); PyErr_NoMemory();
return 0; goto error;
} }
return 1; return 1;
error:
Py_XDECREF(a->a_bytecode);
Py_XDECREF(a->a_lnotab);
return 0;
} }
static void static void