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

b7e2d67f · Serhiy Storchaka · GitHub · 688722ce · b7e2d67f
Commit b7e2d67f authored Feb 13, 2018 by Serhiy Storchaka Committed by GitHub Feb 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

Objects/unicodeobject.c Objects/unicodeobject.c +3 -7

No files found.
--- 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) {
+        assert(end - s <= writer.size - writer.pos);
-            goto onError;
-        }
 #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) {
+        assert(end - s <= writer.size - writer.pos);
-            goto onError;
-        }
 #undef WRITE_CHAR
    }