Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-96577: Fixes buffer overrun in _msi module (GH-96633)

This commit is contained in:
Steve Dower 2022-09-07 18:01:35 +01:00 committed by GitHub
parent 3eaf70d836
commit 4114bcc9ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2022-09-07-00-11-33.gh-issue-96577.kV4K_1.rst Normal file
View File

@ -0,0 +1 @@
Fixes a potential buffer overrun in :mod:`msilib`.

4
PC/_msi.c
View File

@ -360,7 +360,7 @@ msierror(int status)
int code; int code;
char buf[2000]; char buf[2000];
char *res = buf; char *res = buf;
DWORD size = sizeof(buf); DWORD size = Py_ARRAY_LENGTH(buf);
MSIHANDLE err = MsiGetLastErrorRecord(); MSIHANDLE err = MsiGetLastErrorRecord();
if (err == 0) { if (err == 0) {
@ -484,7 +484,7 @@ _msi_Record_GetString_impl(msiobj *self, unsigned int field)
unsigned int status; unsigned int status;
WCHAR buf[2000]; WCHAR buf[2000];
WCHAR *res = buf; WCHAR *res = buf;
DWORD size = sizeof(buf); DWORD size = Py_ARRAY_LENGTH(buf);
PyObject* string; PyObject* string;
status = MsiRecordGetStringW(self->h, field, res, &size); status = MsiRecordGetStringW(self->h, field, res, &size);