Skip to content

bpo-34492: Python/coreconfig.c: Fix _Py_wstrlist_copy() #8910

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
vstinner merged 2 commits into from
Aug 24, 2018
Merged

bpo-34492: Python/coreconfig.c: Fix _Py_wstrlist_copy() #8910

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff12462
bpo-34492: Python/coreconfig.c: Add missing NULL check to _Py_wstrlis…
Aug 24, 2018
6e5c32d
Fix _Py_wstrlist_clear() call on a wrong list
Aug 24, 2018
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
3 changes: 3 additions & 0 deletions Python/coreconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ _Py_wstrlist_copy(int len, wchar_t **list)
assert((len > 0 && list != NULL) || len == 0);
size_t size = len * sizeof(list[0]);
wchar_t **list_copy = PyMem_RawMalloc(size);
if (list_copy == NULL) {
return NULL;
}

@vstinner vstinner Aug 24, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is another bug below: _Py_wstrlist_clear(i, list), it should be list_copy, not list.

@izbyshev izbyshev Aug 24, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!

for (int i=0; i < len; i++) {
wchar_t* arg = _PyMem_RawWcsdup(list[i]);
if (arg == NULL) {
Expand Down