Skip to content

Commit 46030fb

Browse files
sobolevnmiss-islington
authored andcommitted
gh-151126: Fix crash on unset memory error in ctypes.get_errno (GH-151382)
(cherry picked from commit 6b217ea) Co-authored-by: sobolevn <mail@sobolevn.me>
1 parent 8754abc commit 46030fb

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix crash on unset :exc:`MemoryError` on allocation failure in
2+
:func:`ctypes.get_errno`.

Modules/_ctypes/callproc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,9 @@ _ctypes_get_errobj(ctypes_state *st, int **pspace)
181181
}
182182
else {
183183
void *space = PyMem_Calloc(2, sizeof(int));
184-
if (space == NULL)
185-
return NULL;
184+
if (space == NULL) {
185+
return PyErr_NoMemory();
186+
}
186187
errobj = PyCapsule_New(space, CTYPES_CAPSULE_NAME_PYMEM, pymem_destructor);
187188
if (errobj == NULL) {
188189
PyMem_Free(space);

0 commit comments

Comments
 (0)