Skip to content

gh-138756: Fix memory leak in PyInitConfig_Free() #138759

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 3 commits into from
Sep 11, 2025
Merged

gh-138756: Fix memory leak in PyInitConfig_Free() #138759

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d17b37e
gh-138756: Fix memory leak in PyInitConfig_Free()
vstinner Sep 10, 2025
6689f6d
Fix initconfig_free_wstr_list()
vstinner Sep 11, 2025
060722c
Simplify initconfig_free_wstr_list()
vstinner Sep 11, 2025
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
57 changes: 49 additions & 8 deletions Python/initconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,11 @@ static const PyConfigSpec PYPRECONFIG_SPEC[] = {


// Forward declarations
static PyObject*
config_get(const PyConfig *config, const PyConfigSpec *spec,
int use_sys);
static PyObject* config_get(const PyConfig *config, const PyConfigSpec *spec,
int use_sys);
static void initconfig_free_wstr(wchar_t *member);
static void initconfig_free_wstr_list(PyWideStringList *list);
static void initconfig_free_config(const PyConfig *config);


/* --- Command line options --------------------------------------- */
Expand Down Expand Up @@ -3725,6 +3727,8 @@ PyInitConfig_Free(PyInitConfig *config)
if (config == NULL) {
return;
}

initconfig_free_config(&config->config);
free(config->err_msg);
free(config);
}
Expand Down Expand Up @@ -4093,9 +4097,46 @@ PyInitConfig_SetStr(PyInitConfig *config, const char *name, const char* value)
}


static void
initconfig_free_wstr(wchar_t *member)
{
if (member) {
free(member);
}
}


static void
initconfig_free_wstr_list(PyWideStringList *list)
{
for (Py_ssize_t i = 0; i < list->length; i++) {
initconfig_free_wstr(list->items[i]);
}
}


static void
initconfig_free_config(const PyConfig *config)
{
const PyConfigSpec *spec = PYCONFIG_SPEC;
for (; spec->name != NULL; spec++) {
void *member = config_get_spec_member(config, spec);
if (spec->type == PyConfig_MEMBER_WSTR
|| spec->type == PyConfig_MEMBER_WSTR_OPT)
{
wchar_t *wstr = *(wchar_t **)member;
initconfig_free_wstr(wstr);
}
else if (spec->type == PyConfig_MEMBER_WSTR_LIST) {
initconfig_free_wstr_list(member);
}
}
}


static int
_PyWideStringList_FromUTF8(PyInitConfig *config, PyWideStringList *list,
Py_ssize_t length, char * const *items)
initconfig_set_str_list(PyInitConfig *config, PyWideStringList *list,
Py_ssize_t length, char * const *items)
{
PyWideStringList wlist = _PyWideStringList_INIT;
size_t size = sizeof(wchar_t*) * length;
Expand All @@ -4108,14 +4149,14 @@ _PyWideStringList_FromUTF8(PyInitConfig *config, PyWideStringList *list,
for (Py_ssize_t i = 0; i < length; i++) {
wchar_t *arg = utf8_to_wstr(config, items[i]);
if (arg == NULL) {
_PyWideStringList_Clear(&wlist);
initconfig_free_wstr_list(&wlist);
return -1;
}
wlist.items[i] = arg;
wlist.length++;
}

_PyWideStringList_Clear(list);
initconfig_free_wstr_list(list);
*list = wlist;
return 0;
}
Expand All @@ -4136,7 +4177,7 @@ PyInitConfig_SetStrList(PyInitConfig *config, const char *name,
return -1;
}
PyWideStringList *list = raw_member;
if (_PyWideStringList_FromUTF8(config, list, length, items) < 0) {
if (initconfig_set_str_list(config, list, length, items) < 0) {
return -1;
}

Expand Down
Loading