diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-07-17 06:55:42 +0000 |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-07-17 06:55:42 +0000 |
| commit | ed1bf688474c3d90ad665d30f677042a2feecb66 (patch) | |
| tree | 307ba62499dc02b912e8c44a0397d68b08bae011 /Python/_warnings.c | |
| parent | 613f77235f504bef75dee277cd0eff4097b8b5a6 (diff) | |
| download | cpython-ed1bf688474c3d90ad665d30f677042a2feecb66.tar.gz | |
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 da52e357c3..ef7f373bdd 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 { |