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

serhiy-storchaka · serhiy-storchaka · commit 2d6d0b5d508b · 2014-02-12T09:55:45.000+02:00
This silences a Coverity complain.
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -330,7 +330,8 @@ _PyModule_ClearDict(PyObject *d)
                     else
                         PyErr_Clear();
                 }
-                PyDict_SetItem(d, key, Py_None);
+                if (PyDict_SetItem(d, key, Py_None) != 0)
+                    PyErr_Clear();
             }
         }
     }
@@ -349,7 +350,8 @@ _PyModule_ClearDict(PyObject *d)
                     else
                         PyErr_Clear();
                 }
-                PyDict_SetItem(d, key, Py_None);
+                if (PyDict_SetItem(d, key, Py_None) != 0)
+                    PyErr_Clear();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,8 @@ _PyModule_ClearDict(PyObject *d)`
`330`	`330`	`else`
`331`	`331`	`PyErr_Clear();`
`332`	`332`	`}`
`333`		`- PyDict_SetItem(d, key, Py_None);`
	`333`	`+ if (PyDict_SetItem(d, key, Py_None) != 0)`
	`334`	`+ PyErr_Clear();`
`334`	`335`	`}`
`335`	`336`	`}`
`336`	`337`	`}`
`@@ -349,7 +350,8 @@ _PyModule_ClearDict(PyObject *d)`
`349`	`350`	`else`
`350`	`351`	`PyErr_Clear();`
`351`	`352`	`}`
`352`		`- PyDict_SetItem(d, key, Py_None);`
	`353`	`+ if (PyDict_SetItem(d, key, Py_None) != 0)`
	`354`	`+ PyErr_Clear();`
`353`	`355`	`}`
`354`	`356`	`}`
`355`	`357`	`}`