diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-07-17 07:02:18 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-07-17 07:02:18 (GMT) |
| commit | 680ac292ac8fce75836a84c7eccc0c18923e4121 (patch) | |
| tree | c6d426b3fb2bffc7b7dcc00a0a3e0cb01fc5869b /Python | |
| parent | a1c3805ba51e0ae40a9e3cf1667df524e9e92a92 (diff) | |
| download | cpython-680ac292ac8fce75836a84c7eccc0c18923e4121.zip cpython-680ac292ac8fce75836a84c7eccc0c18923e4121.tar.gz cpython-680ac292ac8fce75836a84c7eccc0c18923e4121.tar.bz2 | |
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.
........
................
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/_warnings.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c index da52e35..ef7f373 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 { |