From fcaa2104aaaaefde1527396b1aa8762d07b1aa4a Mon Sep 17 00:00:00 2001 From: Hirokazu Yamamoto Date: Fri, 17 Jul 2009 06:33:03 +0000 Subject: Merged revisions 74040,74042 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74040 | hirokazu.yamamoto | 2009-07-17 15:20:46 +0900 | 1 line Issue #6415: Fixed warnings.warn sagfault on bad formatted string. ........ r74042 | hirokazu.yamamoto | 2009-07-17 15:26:54 +0900 | 1 line NEWS about r74040. ........ --- Python/_warnings.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Python') diff --git a/Python/_warnings.c b/Python/_warnings.c index 6a970bbb2b..1f0f58e31d 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -304,6 +304,8 @@ warn_explicit(PyObject *category, PyObject *message, } if (rc == 1) { text = PyObject_Str(message); + if (text == NULL) + goto cleanup; category = (PyObject*)message->ob_type; } else { -- cgit v1.2.1