Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.

This silences a Coverity complain.

Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.
This silences a Coverity complain.
ee09d7c0 · Serhiy Storchaka · ad38ef7c · ee09d7c0
Commit ee09d7c0 authored Feb 12, 2014 by Serhiy Storchaka
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Objects/moduleobject.c Objects/moduleobject.c +4 -2

No files found.
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -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();
            }
        }
    }