commit 09819ef05a9a1b13321b56c09f48ca45b46e8656
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Feb 12 23:15:57 2018 -0800
committer Serhiy Storchaka <storchaka@gmail.com> Tue Feb 13 09:15:57 2018 +0200
tree 3aecb9d42a681249c882d54298b97c6137f14a67
parent 65c32bbe85862ab5eb52a0d4340e844e13d0f7ee

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

(cherry picked from commit b7e2d67f7c035f09c921ca4e7a36529cd502ccf7)


Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 3d9e09d..d5e7d10 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4256,7 +4256,7 @@
     }
     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 @@
                 &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 @@
                 &writer)) {
             goto onError;
         }
-        if (_PyUnicodeWriter_Prepare(&writer, writer.min_length, 127) < 0) {
-            goto onError;
-        }
+        assert(end - s <= writer.size - writer.pos);
 
 #undef WRITE_CHAR
     }