diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-04-02 16:16:55 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-04-02 16:16:55 (GMT) |
| commit | d818fc9205d9121cde28a9cc2123772fcc531f29 (patch) | |
| tree | b401d5e6d817c6100ea0ee28a9edee56548d0543 /Objects | |
| parent | f93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e (diff) | |
| parent | 9b09ba1234f8ba7a01eaf8986147ae0758712089 (diff) | |
| download | cpython-d818fc9205d9121cde28a9cc2123772fcc531f29.zip cpython-d818fc9205d9121cde28a9cc2123772fcc531f29.tar.gz cpython-d818fc9205d9121cde28a9cc2123772fcc531f29.tar.bz2 | |
merge 3.4 (#21134)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/exceptions.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 44e60dd..861dbc7 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1837,6 +1837,10 @@ UnicodeEncodeError_str(PyObject *self) PyObject *reason_str = NULL; PyObject *encoding_str = NULL; + if (!uself->object) + /* Not properly initialized. */ + return PyUnicode_FromString(""); + /* Get reason and encoding as strings, which they might not be if they've been modified after we were contructed. */ reason_str = PyObject_Str(uself->reason); @@ -1955,6 +1959,10 @@ UnicodeDecodeError_str(PyObject *self) PyObject *reason_str = NULL; PyObject *encoding_str = NULL; + if (!uself->object) + /* Not properly initialized. */ + return PyUnicode_FromString(""); + /* Get reason and encoding as strings, which they might not be if they've been modified after we were contructed. */ reason_str = PyObject_Str(uself->reason); @@ -2049,6 +2057,10 @@ UnicodeTranslateError_str(PyObject *self) PyObject *result = NULL; PyObject *reason_str = NULL; + if (!uself->object) + /* Not properly initialized. */ + return PyUnicode_FromString(""); + /* Get reason as a string, which it might not be if it's been modified after we were contructed. */ reason_str = PyObject_Str(uself->reason); |