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

bpo-23855: Add missing NULL checks for malloc() in _msi.c (GH-9038)

This commit is contained in:
Zackery Spytz 2018-09-07 16:02:56 -06:00 committed by Berker Peksag
parent 28658485a5
commit 4e519377b1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PC/_msi.c
View File

@ -330,6 +330,10 @@ msierror(int status)
code = MsiRecordGetInteger(err, 1); /* XXX code */ code = MsiRecordGetInteger(err, 1); /* XXX code */
if (MsiFormatRecord(0, err, res, &size) == ERROR_MORE_DATA) { if (MsiFormatRecord(0, err, res, &size) == ERROR_MORE_DATA) {
res = malloc(size+1); res = malloc(size+1);
if (res == NULL) {
MsiCloseHandle(err);
return PyErr_NoMemory();
}
MsiFormatRecord(0, err, res, &size); MsiFormatRecord(0, err, res, &size);
res[size]='\0'; res[size]='\0';
} }
@ -560,6 +564,9 @@ summary_getproperty(msiobj* si, PyObject *args)
&fval, sval, &ssize); &fval, sval, &ssize);
if (status == ERROR_MORE_DATA) { if (status == ERROR_MORE_DATA) {
sval = malloc(ssize); sval = malloc(ssize);
if (sval == NULL) {
return PyErr_NoMemory();
}
status = MsiSummaryInfoGetProperty(si->h, field, &type, &ival, status = MsiSummaryInfoGetProperty(si->h, field, &type, &ival,
&fval, sval, &ssize); &fval, sval, &ssize);
} }