Added a NULL check for 'PyRecord::new_record' before calling

'PyTuple_SET_ITEM' in the 'PyRecord::getattro' function. Also 'PyRecord::new_record' will now raise a 'PyErr_NoMemory' exception when the call to 'tp_alloc' returns NULL.
mhammond · Jan 12, 2025 · 06105f2 · 06105f2
1 parent cb675ab
commit 06105f2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/com/win32com/src/PyRecord.cpp b/com/win32com/src/PyRecord.cpp
@@ -244,6 +244,7 @@ PyRecord *PyRecord::new_record(IRecordInfo *ri, PVOID data, PyRecordBuffer *owne
     char *buf = (char *)PyRecord::Type.tp_alloc(type, 0);
     if (buf == NULL) {
         delete owner;
+        PyErr_NoMemory();
         return NULL;
     }
     return new (buf) PyRecord(ri, owner->data, owner);
@@ -641,7 +642,13 @@ PyObject *PyRecord::getattro(PyObject *self, PyObject *obname)
         // in the last parameter, i.e. 'sub_data == NULL'.
         this_data = (BYTE *)psa->pvData;
         for (i = 0; i < nelems; i++) {
-            PyTuple_SET_ITEM(ret_tuple, i, PyRecord::new_record(sub, this_data, pyrec->owner));
+            PyRecord *rec = PyRecord::new_record(sub, this_data, pyrec->owner);
+            if (rec == NULL) {
+                Py_DECREF(ret_tuple);
+                ret_tuple = NULL;
+                goto array_end;
+            }
+            PyTuple_SET_ITEM(ret_tuple, i, rec);
             this_data += element_size;
         }
     array_end: