diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-07-17 06:55:42 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-07-17 06:55:42 (GMT) |
| commit | 1c0c00371f0aba56515174701587ec53bc6051df (patch) | |
| tree | e0273f5b3e030732da30f8736f7581b06432a689 /Python/_warnings.c | |
| parent | e5091f6c5a8c5120588543661fb9abb3ec46eb43 (diff) | |
| download | cpython-1c0c00371f0aba56515174701587ec53bc6051df.zip cpython-1c0c00371f0aba56515174701587ec53bc6051df.tar.gz cpython-1c0c00371f0aba56515174701587ec53bc6051df.tar.bz2 | |
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/_warnings.c')
| -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 { |