From a9fa8560143098168e0380386acbf4846c37472b Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sat, 27 Jun 2026 18:00:34 +0300 Subject: [PATCH] gh-151126: Sets missing exceptions in `tkinter` and `socket` modules initializations (#152418) --- .../next/Library/2026-06-27-17-19-09.gh-issue-151126.huUyOM.rst | 2 ++ Modules/_tkinter.c | 2 +- Modules/socketmodule.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2026-06-27-17-19-09.gh-issue-151126.huUyOM.rst diff --git a/Misc/NEWS.d/next/Library/2026-06-27-17-19-09.gh-issue-151126.huUyOM.rst b/Misc/NEWS.d/next/Library/2026-06-27-17-19-09.gh-issue-151126.huUyOM.rst new file mode 100644 index 000000000000..2e51fd45b595 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-06-27-17-19-09.gh-issue-151126.huUyOM.rst @@ -0,0 +1,2 @@ +Fix two crashes in :mod:`tkinter` and :mod:`socket` modules initialization +under a memory pressure. Sets missing :exc:`MemoryError`. diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 137eba40a762..8fa58d07096e 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -3574,7 +3574,7 @@ PyInit__tkinter(void) tcl_lock = PyThread_allocate_lock(); if (tcl_lock == NULL) - return NULL; + return PyErr_NoMemory(); m = PyModule_Create(&_tkintermodule); if (m == NULL) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 3e82af3194d0..ada4fda65710 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -9296,6 +9296,7 @@ socket_exec(PyObject *m) #if defined(USE_GETHOSTBYNAME_LOCK) netdb_lock = PyThread_allocate_lock(); if (netdb_lock == NULL) { + PyErr_NoMemory(); goto error; } #endif -- 2.47.3