diff options
| author | Nadeem Vawda <nadeem.vawda@gmail.com> | 2012-11-11 03:19:49 +0100 |
|---|---|---|
| committer | Nadeem Vawda <nadeem.vawda@gmail.com> | 2012-11-11 03:19:49 +0100 |
| commit | c8d8929d95e792127bba42a42ccd97dee165dbd4 (patch) | |
| tree | 110d2ed1ee5d0fb80b288174f519a0e24fbcd754 /Python/fileutils.c | |
| parent | 1705501613e48d1a0c235c5eb49e31db31029e31 (diff) | |
| parent | 1672dbd709963c9b62601d4e043a9ae2ad826760 (diff) | |
| download | cpython-c8d8929d95e792127bba42a42ccd97dee165dbd4.tar.gz | |
Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access previously-freed memory.
Patch by Serhiy Storchaka.
Diffstat (limited to 'Python/fileutils.c')
| -rw-r--r-- | Python/fileutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index 501cb8c8d6..526751d5ad 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -85,7 +85,7 @@ _Py_char2wchar(const char* arg, size_t *size) /* Only use the result if it contains no surrogate characters. */ for (tmp = res; *tmp != 0 && - (*tmp < 0xd800 || *tmp > 0xdfff); tmp++) + !Py_UNICODE_IS_SURROGATE(*tmp); tmp++) ; if (*tmp == 0) { if (size != NULL) @@ -131,7 +131,7 @@ _Py_char2wchar(const char* arg, size_t *size) memset(&mbs, 0, sizeof mbs); continue; } - if (*out >= 0xd800 && *out <= 0xdfff) { + if (Py_UNICODE_IS_SURROGATE(*out)) { /* Surrogate character. Escape the original byte sequence with surrogateescape. */ argsize -= converted; |