Skip to content

Commit ab63a5a

Browse files
[3.14] gh-151126: Fix crash on unset memory error in ctypes.get_errno (GH-151382) (#151399)
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 c737fb3 commit ab63a5a

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
@@ -176,8 +176,9 @@ _ctypes_get_errobj(ctypes_state *st, int **pspace)
176176
}
177177
else {
178178
void *space = PyMem_Calloc(2, sizeof(int));
179-
if (space == NULL)
180-
return NULL;
179+
if (space == NULL) {
180+
return PyErr_NoMemory();
181+
}
181182
errobj = PyCapsule_New(space, CTYPES_CAPSULE_NAME_PYMEM, pymem_destructor);
182183
if (errobj == NULL) {
183184
PyMem_Free(space);

0 commit comments

Comments
 (0)