From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Fri, 17 Jul 2009 06:55:42 +0000 (+0000)
Subject: Merged revisions 74040,74042 via svnmerge from
X-Git-Tag: v3.2a1~2817
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c0c00371f0aba56515174701587ec53bc6051df;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index 0910055057c8..7393d25e4276 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -338,6 +338,20 @@ class WarnTests(unittest.TestCase):
                             self.module.warn_explicit,
                             None, Warning, None, 1, registry=42)
 
+    def test_bad_str(self):
+        # issue 6415
+        # Warnings instance with a bad format string for __str__ should not
+        # trigger a bus error.
+        class BadStrWarning(Warning):
+            """Warning with a bad format string for __str__."""
+            def __str__(self):
+                return ("A bad formatted string %(err)" %
+                        {"err" : "there is no %(err)s"})
+
+        with self.assertRaises(ValueError):
+            self.module.warn(BadStrWarning())
+
+
 class CWarnTests(BaseTest, WarnTests):
     module = c_warnings
 
diff --git a/Misc/NEWS b/Misc/NEWS
index e886a0118512..eed368f3d973 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,8 @@ C-API
 Library
 -------
 
+- Issue #6415: Fixed warnings.warn sagfault on bad formatted string.
+
 - Issue #6358: The exit status of a command started with os.popen() was
   reported differently than it did with python 2.x.
 
diff --git a/Python/_warnings.c b/Python/_warnings.c
index da52e357c3ee..ef7f373bddcd 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -320,6 +320,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 {