diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-02-13 08:27:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 08:27:33 +0200 |
| commit | b7e2d67f7c035f09c921ca4e7a36529cd502ccf7 (patch) | |
| tree | 4587c06804f87baacc8edf3be772b0046f4d1ea0 /Objects | |
| parent | 688722cedd6437910ff185ecf94fb3b749ad37f2 (diff) | |
| download | cpython-git-b7e2d67f7c035f09c921ca4e7a36529cd502ccf7.tar.gz | |
bpo-32827: Fix usage of _PyUnicodeWriter_Prepare() in decoding errors handler. (GH-5636)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index f5e4ab62a3..02334382ca 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4256,7 +4256,7 @@ unicode_decode_call_errorhandler_writer( } if (need_to_grow) { writer->overallocate = 1; - if (_PyUnicodeWriter_Prepare(writer, writer->min_length, + if (_PyUnicodeWriter_Prepare(writer, writer->min_length - writer->pos, PyUnicode_MAX_CHAR_VALUE(repunicode)) == -1) goto onError; } @@ -6085,9 +6085,7 @@ _PyUnicode_DecodeUnicodeEscape(const char *s, &writer)) { goto onError; } - if (_PyUnicodeWriter_Prepare(&writer, writer.min_length, 127) < 0) { - goto onError; - } + assert(end - s <= writer.size - writer.pos); #undef WRITE_ASCII_CHAR #undef WRITE_CHAR @@ -6364,9 +6362,7 @@ PyUnicode_DecodeRawUnicodeEscape(const char *s, &writer)) { goto onError; } - if (_PyUnicodeWriter_Prepare(&writer, writer.min_length, 127) < 0) { - goto onError; - } + assert(end - s <= writer.size - writer.pos); #undef WRITE_CHAR } |