summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2013-08-04 18:52:42 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2013-08-04 18:52:42 (GMT)
commit0d4f94a739c95a971774e6a9e72dfee7c973303f (patch)
treed978686acc01c9a2e49a3d9a994e407924ae04c9
parent790d269d393fe625614db5cc8fe8ad0d4029253d (diff)
parent5ed1b38a7d57927ab779132adc2aa8c24ff742f3 (diff)
downloadcpython-0d4f94a739c95a971774e6a9e72dfee7c973303f.zip
cpython-0d4f94a739c95a971774e6a9e72dfee7c973303f.tar.gz
cpython-0d4f94a739c95a971774e6a9e72dfee7c973303f.tar.bz2
Merge.
-rw-r--r--Objects/unicodeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 37fb964..2f437f6 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3235,7 +3235,7 @@ PyUnicode_EncodeLocale(PyObject *unicode, const char *errors)
wchar_t *wstr;
PyObject *bytes = NULL;
char *errmsg;
- PyObject *reason;
+ PyObject *reason = NULL;
PyObject *exc;
size_t error_pos;
int surrogateescape;