From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 13 Feb 2018 07:15:57 +0000 (-0800)
Subject: bpo-32827: Fix usage of _PyUnicodeWriter_Prepare() in decoding errors handler. (GH... 
X-Git-Tag: v3.7.0b2~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09819ef05a9a1b13321b56c09f48ca45b46e8656;p=python

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>
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 3d9e09d7fa..d5e7d10b17 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
     }