Check string for NULL before using it to format the error message.

(Spotted by Neal Norwitz)

diff --git a/Python/codecs.c b/Python/codecs.c
index 09cba7516c97a9698c57e41d3739b25dfc4685d0..12dfe28f847b567860f495185e2047f7e33f5a86 100644 (file)
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -465,9 +465,12 @@ static void wrong_exception_type(PyObject *exc)
        if (name != NULL) {
            PyObject *string = PyObject_Str(name);
            Py_DECREF(name);
-           PyErr_Format(PyExc_TypeError, "don't know how to handle %.400s in error callback",
-               PyString_AS_STRING(string));
-           Py_DECREF(string);
+           if (string != NULL) {
+               PyErr_Format(PyExc_TypeError,
+                   "don't know how to handle %.400s in error callback",
+                   PyString_AS_STRING(string));
+               Py_DECREF(string);
+           }
        }
     }
 }