Message240159
In directory 'PC', file '_msi.c', I found another call to
malloc() which was not checked for a return value of NULL
which would indicate failure. The new patch file is below:
--- _msi.c.orig 2015-04-02 15:01:02.882326352 -0700
+++ _msi.c 2015-04-04 16:36:56.919605881 -0700
@@ -324,6 +324,10 @@
code = MsiRecordGetInteger(err, 1); /* XXX code */
if (MsiFormatRecord(0, err, res, &size) == ERROR_MORE_DATA) {
res = malloc(size+1);
+ if (res == NULL) /* malloc() failed, out of memory... */
+ PyErr_SetString(MSIError, "out of memory");
+ return NULL;
+ }
MsiFormatRecord(0, err, res, &size);
res[size]='\0';
}
@@ -547,6 +551,10 @@
&fval, sval, &ssize);
if (status == ERROR_MORE_DATA) {
sval = malloc(ssize);
+ if (sval == NULL) { /* malloc() failed, out of memory... */
+ PyErr_SetString(MSIError, "out of memory");
+ return NULL;
+ }
status = MsiSummaryInfoGetProperty(si->h, field, &type, &ival,
&fval, sval, &ssize);
} |
|
| Date |
User |
Action |
Args |
| 2015-04-06 16:58:35 | dogbert2 | set | recipients:
+ dogbert2, tim.golden, zach.ware, steve.dower |
| 2015-04-06 16:58:35 | dogbert2 | set | messageid: <1428339515.45.0.911525412797.issue23855@psf.upfronthosting.co.za> |
| 2015-04-06 16:58:35 | dogbert2 | link | issue23855 messages |
| 2015-04-06 16:58:35 | dogbert2 | create | |
|