From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 10 Nov 2023 14:43:51 +0000 (+0100)
Subject: [3.11] gh-111251: Fix error checking in _blake2 module init (GH-111252) (#111298)
X-Git-Tag: v3.11.7~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b55a955bc4066c5db4c842b3d7319df487fb750;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-111251: Fix error checking in _blake2 module init (GH-111252) (#111298)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---

diff --git a/Misc/NEWS.d/next/Library/2023-10-24-12-09-46.gh-issue-111251.urFYtn.rst b/Misc/NEWS.d/next/Library/2023-10-24-12-09-46.gh-issue-111251.urFYtn.rst
new file mode 100644
index 000000000000..3a87cb25da5c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-10-24-12-09-46.gh-issue-111251.urFYtn.rst
@@ -0,0 +1 @@
+Fix :mod:`_blake2` not checking for errors when initializing.
diff --git a/Modules/_blake2/blake2module.c b/Modules/_blake2/blake2module.c
index 44d783b40d04..93478f5c8bda 100644
--- a/Modules/_blake2/blake2module.c
+++ b/Modules/_blake2/blake2module.c
@@ -74,6 +74,12 @@ _blake2_free(void *module)
     Py_DECREF(x); \
 } while(0)
 
+#define ADD_INT_CONST(NAME, VALUE) do { \
+    if (PyModule_AddIntConstant(m, NAME, VALUE) < 0) { \
+        return -1; \
+    } \
+} while (0)
+
 static int
 blake2_exec(PyObject *m)
 {
@@ -95,10 +101,10 @@ blake2_exec(PyObject *m)
     ADD_INT(d, "MAX_KEY_SIZE", BLAKE2B_KEYBYTES);
     ADD_INT(d, "MAX_DIGEST_SIZE", BLAKE2B_OUTBYTES);
 
-    PyModule_AddIntConstant(m, "BLAKE2B_SALT_SIZE", BLAKE2B_SALTBYTES);
-    PyModule_AddIntConstant(m, "BLAKE2B_PERSON_SIZE", BLAKE2B_PERSONALBYTES);
-    PyModule_AddIntConstant(m, "BLAKE2B_MAX_KEY_SIZE", BLAKE2B_KEYBYTES);
-    PyModule_AddIntConstant(m, "BLAKE2B_MAX_DIGEST_SIZE", BLAKE2B_OUTBYTES);
+    ADD_INT_CONST("BLAKE2B_SALT_SIZE", BLAKE2B_SALTBYTES);
+    ADD_INT_CONST("BLAKE2B_PERSON_SIZE", BLAKE2B_PERSONALBYTES);
+    ADD_INT_CONST("BLAKE2B_MAX_KEY_SIZE", BLAKE2B_KEYBYTES);
+    ADD_INT_CONST("BLAKE2B_MAX_DIGEST_SIZE", BLAKE2B_OUTBYTES);
 
     /* BLAKE2s */
     st->blake2s_type = (PyTypeObject *)PyType_FromModuleAndSpec(
@@ -117,14 +123,17 @@ blake2_exec(PyObject *m)
     ADD_INT(d, "MAX_KEY_SIZE", BLAKE2S_KEYBYTES);
     ADD_INT(d, "MAX_DIGEST_SIZE", BLAKE2S_OUTBYTES);
 
-    PyModule_AddIntConstant(m, "BLAKE2S_SALT_SIZE", BLAKE2S_SALTBYTES);
-    PyModule_AddIntConstant(m, "BLAKE2S_PERSON_SIZE", BLAKE2S_PERSONALBYTES);
-    PyModule_AddIntConstant(m, "BLAKE2S_MAX_KEY_SIZE", BLAKE2S_KEYBYTES);
-    PyModule_AddIntConstant(m, "BLAKE2S_MAX_DIGEST_SIZE", BLAKE2S_OUTBYTES);
+    ADD_INT_CONST("BLAKE2S_SALT_SIZE", BLAKE2S_SALTBYTES);
+    ADD_INT_CONST("BLAKE2S_PERSON_SIZE", BLAKE2S_PERSONALBYTES);
+    ADD_INT_CONST("BLAKE2S_MAX_KEY_SIZE", BLAKE2S_KEYBYTES);
+    ADD_INT_CONST("BLAKE2S_MAX_DIGEST_SIZE", BLAKE2S_OUTBYTES);
 
     return 0;
 }
 
+#undef ADD_INT
+#undef ADD_INT_CONST
+
 static PyModuleDef_Slot _blake2_slots[] = {
     {Py_mod_exec, blake2_exec},
     {0, NULL}