commit b44ffc8b409fd539c5fb2b79385498e9fe168880
author Marco Paolini <mpaolini@users.noreply.github.com> Fri Nov 15 08:42:51 2019 +0000
committer Serhiy Storchaka <storchaka@gmail.com> Fri Nov 15 10:42:51 2019 +0200
tree 72a72f44424e9701e17251e7c1bb3171db9ef91f
parent 57d3ab85a4a4cf740b538ca3450849986f85df87

bpo-38677: Fix arraymodule error handling in module initialization. (GH-17039)

Modules/arraymodule.c

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 5ba2618..1ceba9e 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -3040,9 +3040,15 @@
     Py_TYPE(&PyArrayIter_Type) = &PyType_Type;
 
     Py_INCREF((PyObject *)&Arraytype);
-    PyModule_AddObject(m, "ArrayType", (PyObject *)&Arraytype);
+    if (PyModule_AddObject(m, "ArrayType", (PyObject *)&Arraytype) < 0) {
+        Py_DECREF((PyObject *)&Arraytype);
+        return -1;
+    }
     Py_INCREF((PyObject *)&Arraytype);
-    PyModule_AddObject(m, "array", (PyObject *)&Arraytype);
+    if (PyModule_AddObject(m, "array", (PyObject *)&Arraytype) < 0) {
+        Py_DECREF((PyObject *)&Arraytype);
+        return -1;
+    }
 
     for (descr=descriptors; descr->typecode != '\0'; descr++) {
         size++;
@@ -3053,13 +3059,11 @@
         *p++ = (char)descr->typecode;
     }
     typecodes = PyUnicode_DecodeASCII(buffer, p - buffer, NULL);
-
-    PyModule_AddObject(m, "typecodes", typecodes);
-
-    if (PyErr_Occurred()) {
-        Py_DECREF(m);
-        m = NULL;
+    if (PyModule_AddObject(m, "typecodes", typecodes) < 0) {
+        Py_XDECREF(typecodes);
+        return -1;
     }
+
     return 0;
 }