Merged revisions 74046 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74046 | hirokazu.yamamoto | 2009-07-17 15:55:42 +0900 | 13 lines

  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.
  ........
................
This commit is contained in:
Hirokazu Yamamoto 2009-07-17 07:02:18 +00:00
parent a1c3805ba5
commit 680ac292ac
3 changed files with 18 additions and 0 deletions

View file

@ -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 {