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

doerwalter · doerwalter · commit afbd201b884c · 2002-09-02T18:22:32.000Z
(Spotted by Neal Norwitz) git-svn-id: http://svn.python.org/projects/python/trunk@28522 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git 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);
+	    }
 	}
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -465,9 +465,12 @@ static void wrong_exception_type(PyObject *exc)`
`465`	`465`	`if (name != NULL) {`
`466`	`466`	`PyObject *string = PyObject_Str(name);`
`467`	`467`	`Py_DECREF(name);`
`468`		`- PyErr_Format(PyExc_TypeError, "don't know how to handle %.400s in error callback",`
`469`		`- PyString_AS_STRING(string));`
`470`		`- Py_DECREF(string);`
	`468`	`+ if (string != NULL) {`
	`469`	`+ PyErr_Format(PyExc_TypeError,`
	`470`	`+ "don't know how to handle %.400s in error callback",`
	`471`	`+ PyString_AS_STRING(string));`
	`472`	`+ Py_DECREF(string);`
	`473`	`+ }`
`471`	`474`	`}`
`472`	`475`	`}`
`473`	`476`	`}`