From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 12 Feb 2014 07:55:01 +0000 (+0200)
Subject: Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.
X-Git-Tag: v3.3.5rc1~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f9d11b986c95005fbebb724ee3425ad2eb30967;p=thirdparty%2FPython%2Fcpython.git

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 2f2bd36b55d2..72978aef53a3 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -300,7 +300,8 @@ _PyModule_Clear(PyObject *m)
                     else
                         PyErr_Clear();
                 }
-                PyDict_SetItem(d, key, Py_None);
+                if (PyDict_SetItem(d, key, Py_None) != 0)
+                    PyErr_Clear();
             }
         }
     }
@@ -319,7 +320,8 @@ _PyModule_Clear(PyObject *m)
                     else
                         PyErr_Clear();
                 }
-                PyDict_SetItem(d, key, Py_None);
+                if (PyDict_SetItem(d, key, Py_None) != 0)
+                    PyErr_Clear();
             }
         }
     }