summaryrefslogtreecommitdiff
path: root/Python/errors.c
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-01-05 05:25:22 +0000
committerNeal Norwitz <nnorwitz@gmail.com>2007-01-05 05:25:22 +0000
commitc3319bd12f995f826f6a426b342959360f0d22c0 (patch)
treea509e96cca23162fe8c0b0b36e6a665852b3d403 /Python/errors.c
parent462fadcb80af45fa18041c8a409deed63eb03e56 (diff)
downloadcpython-c3319bd12f995f826f6a426b342959360f0d22c0.tar.gz
Prevent crash on shutdown which can occur if we are finalizing
and the module dict has been cleared already and some object raises a warning (like in a __del__). Will backport.
Diffstat (limited to 'Python/errors.c')
-rw-r--r--Python/errors.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/errors.c b/Python/errors.c
index 66a734eb15..f31f025112 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -640,7 +640,8 @@ PyErr_WarnEx(PyObject *category, const char *message, Py_ssize_t stack_level)
if (warnings_module != NULL) {
dict = PyModule_GetDict(warnings_module);
- func = PyDict_GetItemString(dict, "warn");
+ if (dict != NULL)
+ func = PyDict_GetItemString(dict, "warn");
}
if (func == NULL) {
PySys_WriteStderr("warning: %s\n", message);