Skip to content
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

gh-96577: Fixes buffer overrun in _msi module #96633

Merged
merged 1 commit into from
Sep 7, 2022
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes a potential buffer overrun in :mod:`msilib`.
Copy link
Member

Choose a reason for hiding this comment

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

You may move this to the security category, but I'm fine with the Windows category.

4 changes: 2 additions & 2 deletions PC/_msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ msierror(int status)
int code;
char buf[2000];
char *res = buf;
DWORD size = sizeof(buf);
DWORD size = Py_ARRAY_LENGTH(buf);
MSIHANDLE err = MsiGetLastErrorRecord();

if (err == 0) {
Expand Down Expand Up @@ -484,7 +484,7 @@ _msi_Record_GetString_impl(msiobj *self, unsigned int field)
unsigned int status;
WCHAR buf[2000];
WCHAR *res = buf;
DWORD size = sizeof(buf);
DWORD size = Py_ARRAY_LENGTH(buf);
PyObject* string;

status = MsiRecordGetStringW(self->h, field, res, &size);
Expand Down