Prevent crash on shutdown which can occur if we are finalizing

neal.norwitz · neal.norwitz · commit 19aaf32c7ede · 2007-01-05T05:25:22.000Z
and the module dict has been cleared already and some object raises a warning (like in a __del__). Will backport. git-svn-id: http://svn.python.org/projects/python/trunk@53255 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 1?
 Core and builtins
 -----------------
 
+- Prevent seg fault on shutdown which could occur if an object
+  raised a warning.
+
 - Bug #1566280: Explicitly invoke threading._shutdown from Py_Main,
   to avoid relying on atexit.
 
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,8 @@ PyErr_WarnEx(PyObject category, const char message, Py_ssize_t stack_level)`
`640`	`640`
`641`	`641`	`if (warnings_module != NULL) {`
`642`	`642`	`dict = PyModule_GetDict(warnings_module);`
`643`		`- func = PyDict_GetItemString(dict, "warn");`
	`643`	`+ if (dict != NULL)`
	`644`	`+ func = PyDict_GetItemString(dict, "warn");`
`644`	`645`	`}`
`645`	`646`	`if (func == NULL) {`
`646`	`647`	`PySys_WriteStderr("warning: %s\n", message);`