Skip to content

bpo-1635741: Fix potential refleaks in binascii module #18613

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
merged 2 commits into from
Mar 11, 2020
Merged

bpo-1635741: Fix potential refleaks in binascii module #18613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a3274a
Fix potential refleaks in binascii module
shihai1991 Feb 23, 2020
a2f1f99
using the var name module to replace m
shihai1991 Mar 1, 2020
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
52 changes: 45 additions & 7 deletions Modules/binascii.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ typedef struct binascii_state {
PyObject *Incomplete;
} binascii_state;

static binascii_state *
get_binascii_state(PyObject *module)
{
return (binascii_state *)PyModule_GetState(module);
}

/*
** hqx lookup table, ascii->binary.
*/
Expand Down Expand Up @@ -1606,9 +1612,9 @@ static struct PyMethodDef binascii_module_methods[] = {
PyDoc_STRVAR(doc_binascii, "Conversion between binary data and ASCII");

static int
binascii_exec(PyObject *m) {
binascii_exec(PyObject *module) {
int result;
binascii_state *state = PyModule_GetState(m);
binascii_state *state = PyModule_GetState(module);
if (state == NULL) {
return -1;
}
Expand All @@ -1617,17 +1623,21 @@ binascii_exec(PyObject *m) {
if (state->Error == NULL) {
return -1;
}
result = PyModule_AddObject(m, "Error", state->Error);
Py_INCREF(state->Error);
result = PyModule_AddObject(module, "Error", state->Error);
if (result == -1) {
Py_DECREF(state->Error);
return -1;
}

state->Incomplete = PyErr_NewException("binascii.Incomplete", NULL, NULL);
if (state->Incomplete == NULL) {
return -1;
}
result = PyModule_AddObject(m, "Incomplete", state->Incomplete);
Py_INCREF(state->Incomplete);
result = PyModule_AddObject(module, "Incomplete", state->Incomplete);
if (result == -1) {
Py_DECREF(state->Incomplete);
return -1;
}

Expand All @@ -1639,16 +1649,44 @@ static PyModuleDef_Slot binascii_slots[] = {
{0, NULL}
};

static int
binascii_traverse(PyObject *module, visitproc visit, void *arg)
{
binascii_state *state = get_binascii_state(module);
if (state) {
Py_VISIT(state->Error);
Py_VISIT(state->Incomplete);
}
return 0;
}

static int
binascii_clear(PyObject *module)
{
binascii_state *state = get_binascii_state(module);
if (state) {
Py_CLEAR(state->Error);
Py_CLEAR(state->Incomplete);
}
return 0;
}

static void
binascii_free(void *module)
{
binascii_clear((PyObject *)module);
}

static struct PyModuleDef binasciimodule = {
PyModuleDef_HEAD_INIT,
"binascii",
doc_binascii,
sizeof(binascii_state),
binascii_module_methods,
binascii_slots,
NULL,
NULL,
NULL
binascii_traverse,
binascii_clear,
binascii_free
};

PyMODINIT_FUNC
Expand Down