diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-07-17 06:33:03 +0000 |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-07-17 06:33:03 +0000 |
| commit | fcaa2104aaaaefde1527396b1aa8762d07b1aa4a (patch) | |
| tree | 7eb976a8bee44449967ff775312714501db17032 /Python/_warnings.c | |
| parent | eed738bec0386092378d03c4242ee25be0a6ff44 (diff) | |
| download | cpython-git-fcaa2104aaaaefde1527396b1aa8762d07b1aa4a.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 6a970bbb2b..1f0f58e31d 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -304,6 +304,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 { |