Unverified Kaydet (Commit) 310b424c authored tarafından Miss Islington (bot)'s avatar Miss Islington (bot) Kaydeden (comit) GitHub

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

(cherry picked from commit b7e2d67f)
Co-authored-by: 's avatarSerhiy Storchaka <storchaka@gmail.com>
üst c3f9d7e0
......@@ -4500,7 +4500,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;
}
......@@ -6176,9 +6176,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
......@@ -6455,9 +6453,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
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment