From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 27 Jun 2026 15:24:50 +0000 (+0200)
Subject: [3.13] gh-151126: Sets missing exceptions in `tkinter` and `socket` modules initializ... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f158c0a5851aec739b2020405164b7312aa286c2;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-151126: Sets missing exceptions in `tkinter` and `socket` modules initializations (GH-152418) (#152422)

gh-151126: Sets missing exceptions in `tkinter` and `socket` modules initializations (GH-152418)
(cherry picked from commit a9fa8560143098168e0380386acbf4846c37472b)

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

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 38b0b101c9b9..ee717f723d5b 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -3470,7 +3470,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 9abd94b9b905..8008c101251c 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -8942,6 +8942,7 @@ socket_exec(PyObject *m)
 #if defined(USE_GETHOSTBYNAME_LOCK)
     netdb_lock = PyThread_allocate_lock();
     if (netdb_lock == NULL) {
+        PyErr_NoMemory();
         goto error;
     }
 #endif