commit 4e519377b1b84c9414a360961276993d24198825
author Zackery Spytz <zspytz@gmail.com> Fri Sep 07 16:02:56 2018 -0600
committer Berker Peksag <berker.peksag@gmail.com> Sat Sep 08 01:02:56 2018 +0300
tree 34a8467111c8e6655e05d4d635f764a0fbb4ac03
parent 28658485a54ad5f9df52ecc12d9046269f1654ec

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

PC/_msi.c

diff --git a/PC/_msi.c b/PC/_msi.c
index 000d81f..024b2d3 100644
--- a/PC/_msi.c
+++ b/PC/_msi.c
@@ -330,6 +330,10 @@
     code = MsiRecordGetInteger(err, 1); /* XXX code */
     if (MsiFormatRecord(0, err, res, &size) == ERROR_MORE_DATA) {
         res = malloc(size+1);
+        if (res == NULL) {
+            MsiCloseHandle(err);
+            return PyErr_NoMemory();
+        }
         MsiFormatRecord(0, err, res, &size);
         res[size]='\0';
     }
@@ -560,6 +564,9 @@
         &fval, sval, &ssize);
     if (status == ERROR_MORE_DATA) {
         sval = malloc(ssize);
+        if (sval == NULL) {
+            return PyErr_NoMemory();
+        }
         status = MsiSummaryInfoGetProperty(si->h, field, &type, &ival,
             &fval, sval, &ssize);
     }