From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 1 Nov 2023 20:01:28 +0000 (+0100)
Subject: [3.12] gh-111253: Fix error checking in _socket module init (GH-111254) (#111299)
X-Git-Tag: v3.12.1~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99f0dd88b1ef8309a4e2a23a51bb47e18e1d81f3;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-111253: Fix error checking in _socket module init (GH-111254) (#111299)

gh-111253: Fix error checking in _socket module init (GH-111254)
(cherry picked from commit 3052c098ca2779c2d9ab9800dabe66d0efa01794)

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

diff --git a/Misc/NEWS.d/next/Library/2023-10-24-12-20-46.gh-issue-111253.HFywSK.rst b/Misc/NEWS.d/next/Library/2023-10-24-12-20-46.gh-issue-111253.HFywSK.rst
new file mode 100644
index 000000000000..e21a42605aea
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-10-24-12-20-46.gh-issue-111253.HFywSK.rst
@@ -0,0 +1 @@
+Add error checking during :mod:`!_socket` module init.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 62b0e67be15c..de7229d2ced2 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -7703,10 +7703,10 @@ socket_exec(PyObject *m)
 
 /* FreeBSD divert(4) */
 #ifdef PF_DIVERT
-    PyModule_AddIntMacro(m, PF_DIVERT);
+    ADD_INT_MACRO(m, PF_DIVERT);
 #endif
 #ifdef AF_DIVERT
-    PyModule_AddIntMacro(m, AF_DIVERT);
+    ADD_INT_MACRO(m, AF_DIVERT);
 #endif
 
 #ifdef AF_PACKET