From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 12 Feb 2014 07:54:48 +0000 (+0200)
Subject: Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.
X-Git-Tag: v2.7.7rc1~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee09d7c098ae4e52a9110ea0e1b55de3996c59f5;p=python

Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.
This silences a Coverity complain.
---

diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 08e9740edb..f2fed30e90 100644
--- 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();
             }
         }
     }