diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-12 07:54:48 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-12 07:54:48 (GMT) |
| commit | ee09d7c098ae4e52a9110ea0e1b55de3996c59f5 (patch) | |
| tree | fa8f1a275d79055ce13c98841682c5cab45cd424 | |
| parent | ad38ef7c09edf0b923f9c736cc440f95313c8a0a (diff) | |
| download | cpython-ee09d7c098ae4e52a9110ea0e1b55de3996c59f5.zip cpython-ee09d7c098ae4e52a9110ea0e1b55de3996c59f5.tar.gz cpython-ee09d7c098ae4e52a9110ea0e1b55de3996c59f5.tar.bz2 | |
Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.
This silences a Coverity complain.
| -rw-r--r-- | Objects/moduleobject.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 08e9740..f2fed30 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(); } } } |