diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-08-20 17:04:47 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-08-20 17:04:47 (GMT) |
| commit | ec67d187ee9a86aaf1108643832f69ad3bc0e369 (patch) | |
| tree | 4204908c059a42f7890e3fd765e6377f5fe8db59 | |
| parent | 98985a1980304b3c8fee9b9efdac015c6098bd67 (diff) | |
| download | cpython-ec67d187ee9a86aaf1108643832f69ad3bc0e369.zip cpython-ec67d187ee9a86aaf1108643832f69ad3bc0e369.tar.gz cpython-ec67d187ee9a86aaf1108643832f69ad3bc0e369.tar.bz2 | |
Issue #13461: Fix a crash in the TextIOWrapper.tell method on 64-bit platforms.
Patch by Yogesh Chaudhari.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_io/textio.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -66,6 +66,9 @@ Core and Builtins Library ------- +- Issue #13461: Fix a crash in the TextIOWrapper.tell method on 64-bit + platforms. Patch by Yogesh Chaudhari. + - Issue #18777: The ssl module now uses the new CRYPTO_THREADID API of OpenSSL 1.0.0+ instead of the deprecated CRYPTO id callback function. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index cd751c1..111cc7e 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -2370,7 +2370,7 @@ textiowrapper_tell(textio *self, PyObject *args) while (input < input_end) { Py_ssize_t n; - DECODER_DECODE(input, 1, n); + DECODER_DECODE(input, (Py_ssize_t)1, n); /* We got n chars for 1 byte */ chars_decoded += n; cookie.bytes_to_feed += 1; |