traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-32827: Fix usage of _PyUnicodeWriter_Prepare() in decoding errors handler. (GH-5636) 

(cherry picked from commit b7e2d67f7c)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2018-02-13 01:32:46 -08:00 committed by GitHub
parent c3f9d7e0ea
commit 310b424c47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Objects/unicodeobject.c
View File

@ -4500,7 +4500,7 @@ unicode_decode_call_errorhandler_writer(
} }
if (need_to_grow) { if (need_to_grow) {
writer->overallocate = 1; 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) PyUnicode_MAX_CHAR_VALUE(repunicode)) == -1)
goto onError; goto onError;
} }
@ -6176,9 +6176,7 @@ _PyUnicode_DecodeUnicodeEscape(const char *s,
&writer)) { &writer)) {
goto onError; goto onError;
} }
if (_PyUnicodeWriter_Prepare(&writer, writer.min_length, 127) < 0) { assert(end - s <= writer.size - writer.pos);
goto onError;
}
#undef WRITE_ASCII_CHAR #undef WRITE_ASCII_CHAR
#undef WRITE_CHAR #undef WRITE_CHAR
@ -6455,9 +6453,7 @@ PyUnicode_DecodeRawUnicodeEscape(const char *s,
&writer)) { &writer)) {
goto onError; goto onError;
} }
if (_PyUnicodeWriter_Prepare(&writer, writer.min_length, 127) < 0) { assert(end - s <= writer.size - writer.pos);
goto onError;
}
#undef WRITE_CHAR #undef WRITE_CHAR
} }