From 8a0c254fdd68cfafede168356fc5c5c3e372bc3f Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 10 Sep 2018 09:41:31 -0700 Subject: bpo-23855: Add missing NULL checks for malloc() in _msi.c (GH-9038) (cherry picked from commit 4e519377b1b84c9414a360961276993d24198825) Co-authored-by: Zackery Spytz --- PC/_msi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PC/_msi.c b/PC/_msi.c index a7c8fa3..0487743 100644 --- a/PC/_msi.c +++ b/PC/_msi.c @@ -340,6 +340,10 @@ msierror(int status) 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'; } @@ -563,6 +567,9 @@ summary_getproperty(msiobj* si, PyObject *args) &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); } -- cgit v0.12