summaryrefslogtreecommitdiff
path: root/Objects
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-02-12 09:54:48 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2014-02-12 09:54:48 +0200
commit6465c753548d66a73f8560f0daf7641ae07e962b (patch)
tree8311b775571c9e86f0b7e98b3449adccb41d38e8 /Objects
parent3dc529f3d52f3b5b7e2193d49c6b3607702dd3b9 (diff)
downloadcpython-6465c753548d66a73f8560f0daf7641ae07e962b.tar.gz
Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.
This silences a Coverity complain.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/moduleobject.c6
1 files changed, 4 insertions, 2 deletions
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();
}
}
}