From: Ivy Xu <fakeshadow1337@gmail.com>
Date: Thu, 25 Jun 2026 10:47:25 +0000 (+0800)
Subject: gh-151126: Add missing `PyErr_NoMemory` in `_winapi.c` (#151588)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a580029f1168cf87707b157865b6a6b89a77b7ad;p=thirdparty%2FPython%2Fcpython.git

gh-151126: Add missing `PyErr_NoMemory` in `_winapi.c` (#151588)

Co-authored-by: sobolevn <mail@sobolevn.me>
---

diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-06-17-16-46-07.gh-issue-151126.vhTL0T.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-17-16-46-07.gh-issue-151126.vhTL0T.rst
new file mode 100644
index 000000000000..6f2d230b1dcf
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-17-16-46-07.gh-issue-151126.vhTL0T.rst
@@ -0,0 +1,2 @@
+Avoid possible crash in ``_winapi.c`` where a device has no memory left. Now
+it properly raises a :exc:`MemoryError`. Patch by Ivy Xu.
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
index 369a7400eb63..5bbb02fe414b 100644
--- a/Modules/_winapi.c
+++ b/Modules/_winapi.c
@@ -1684,6 +1684,9 @@ _winapi_GetShortPathName_impl(PyObject *module, LPCWSTR path)
             }
             PyMem_Free((void *)buffer);
         }
+        else {
+            PyErr_NoMemory();
+        }
     } else {
         PyErr_SetFromWindowsErr(0);
     }
@@ -2394,6 +2397,7 @@ _winapi_BatchedWaitForMultipleObjects_impl(PyObject *module,
     while (i < nhandles) {
         BatchedWaitData *data = (BatchedWaitData*)PyMem_Malloc(sizeof(BatchedWaitData));
         if (!data) {
+            PyErr_NoMemory();
             goto error;
         }
         thread_data[thread_count++] = data;