Skip to content

Fix some very unlikely leaks in extensions. #20689

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.

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 1 commit into from
Jul 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/_backend_agg_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -656,19 +656,21 @@ PyMODINIT_FUNC PyInit__backend_agg(void)
{
PyObject *m;

import_array();

m = PyModule_Create(&moduledef);

if (m == NULL) {
return NULL;
}

import_array();

if (!PyRendererAgg_init_type(m, &PyRendererAggType)) {
Py_DECREF(m);
return NULL;
}

if (!PyBufferRegion_init_type(m, &PyBufferRegionType)) {
Py_DECREF(m);
return NULL;
}

Expand Down
5 changes: 3 additions & 2 deletions src/_contour_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,18 +170,19 @@ PyMODINIT_FUNC PyInit__contour(void)
{
PyObject *m;

import_array();

m = PyModule_Create(&moduledef);

if (m == NULL) {
return NULL;
}

if (!PyQuadContourGenerator_init_type(m, &PyQuadContourGeneratorType)) {
Py_DECREF(m);
return NULL;
}

import_array();

return m;
}

Expand Down
5 changes: 3 additions & 2 deletions src/_image_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ PyMODINIT_FUNC PyInit__image(void)
{
PyObject *m;

import_array();

m = PyModule_Create(&moduledef);

if (m == NULL) {
Expand All @@ -336,11 +338,10 @@ PyMODINIT_FUNC PyInit__image(void)
PyModule_AddIntConstant(m, "LANCZOS", LANCZOS) ||
PyModule_AddIntConstant(m, "BLACKMAN", BLACKMAN) ||
PyModule_AddIntConstant(m, "_n_interpolation", _n_interpolation)) {
Py_DECREF(m);
return NULL;
}

import_array();

return m;
}

Expand Down
5 changes: 3 additions & 2 deletions src/_path_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -908,14 +908,15 @@ static struct PyModuleDef moduledef = {
PyMODINIT_FUNC PyInit__path(void)
{
PyObject *m;

import_array();

m = PyModule_Create(&moduledef);

if (m == NULL) {
return NULL;
}

import_array();

return m;
}

Expand Down
11 changes: 9 additions & 2 deletions src/ft2font_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1551,21 +1551,26 @@ PyMODINIT_FUNC PyInit_ft2font(void)
{
PyObject *m;

import_array();

m = PyModule_Create(&moduledef);

if (m == NULL) {
return NULL;
}

if (!PyFT2Image_init_type(m, &PyFT2ImageType)) {
Py_DECREF(m);
return NULL;
}

if (!PyGlyph_init_type(m, &PyGlyphType)) {
Py_DECREF(m);
return NULL;
}

if (!PyFT2Font_init_type(m, &PyFT2FontType)) {
Py_DECREF(m);
return NULL;
}

Expand Down Expand Up @@ -1607,6 +1612,7 @@ PyMODINIT_FUNC PyInit_ft2font(void)
add_dict_int(d, "LOAD_TARGET_MONO", (unsigned long)FT_LOAD_TARGET_MONO) ||
add_dict_int(d, "LOAD_TARGET_LCD", (unsigned long)FT_LOAD_TARGET_LCD) ||
add_dict_int(d, "LOAD_TARGET_LCD_V", (unsigned long)FT_LOAD_TARGET_LCD_V)) {
Py_DECREF(m);
return NULL;
}

Expand All @@ -1615,6 +1621,7 @@ PyMODINIT_FUNC PyInit_ft2font(void)

if (error) {
PyErr_SetString(PyExc_RuntimeError, "Could not initialize the freetype2 library");
Py_DECREF(m);
return NULL;
}

Expand All @@ -1625,16 +1632,16 @@ PyMODINIT_FUNC PyInit_ft2font(void)
FT_Library_Version(_ft2Library, &major, &minor, &patch);
sprintf(version_string, "%d.%d.%d", major, minor, patch);
if (PyModule_AddStringConstant(m, "__freetype_version__", version_string)) {
Py_DECREF(m);
return NULL;
}
}

if (PyModule_AddStringConstant(m, "__freetype_build_type__", STRINGIFY(FREETYPE_BUILD_TYPE))) {
Py_DECREF(m);
return NULL;
}

import_array();

return m;
}

Expand Down
4 changes: 2 additions & 2 deletions src/qhull_wrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,14 @@ PyInit__qhull(void)
{
PyObject* m;

import_array();

m = PyModule_Create(&qhull_module);

if (m == NULL) {
return NULL;
}

import_array();

return m;
}

Expand Down
7 changes: 5 additions & 2 deletions src/tri/_tri_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -510,24 +510,27 @@ PyMODINIT_FUNC PyInit__tri(void)
{
PyObject *m;

import_array();

m = PyModule_Create(&moduledef);

if (m == NULL) {
return NULL;
}

if (!PyTriangulation_init_type(m, &PyTriangulationType)) {
Py_DECREF(m);
return NULL;
}
if (!PyTriContourGenerator_init_type(m, &PyTriContourGeneratorType)) {
Py_DECREF(m);
return NULL;
}
if (!PyTrapezoidMapTriFinder_init_type(m, &PyTrapezoidMapTriFinderType)) {
Py_DECREF(m);
return NULL;
}

import_array();

return m;
}

Expand Down