]> granicus.if.org Git - python/commitdiff
Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 12 Feb 2014 07:54:48 +0000 (09:54 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 12 Feb 2014 07:54:48 +0000 (09:54 +0200)
This silences a Coverity complain.

Objects/moduleobject.c

index 08e9740edb421f14e05f101c7725b1a3616a25a7..f2fed30e90dd8e3cb3cc09a3d6e93d494cff61f2 100644 (file)
@@ -122,7 +122,8 @@ _PyModule_Clear(PyObject *m)
             if (s[0] == '_' && s[1] != '_') {
                 if (Py_VerboseFlag > 1)
                     PySys_WriteStderr("#   clear[1] %s\n", s);
-                PyDict_SetItem(d, key, Py_None);
+                if (PyDict_SetItem(d, key, Py_None) != 0)
+                    PyErr_Clear();
             }
         }
     }
@@ -135,7 +136,8 @@ _PyModule_Clear(PyObject *m)
             if (s[0] != '_' || strcmp(s, "__builtins__") != 0) {
                 if (Py_VerboseFlag > 1)
                     PySys_WriteStderr("#   clear[2] %s\n", s);
-                PyDict_SetItem(d, key, Py_None);
+                if (PyDict_SetItem(d, key, Py_None) != 0)
+                    PyErr_Clear();
             }
         }
     }