From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 6 Sep 2016 23:58:36 +0000 (-0700)
Subject: _PyUnicodeWriter: assert that max character <= MAX_UNICODE
X-Git-Tag: v3.6.0b1~383
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2740e460897cf9efcdb8c83076fd640016f007d4;p=thirdparty%2FPython%2Fcpython.git

_PyUnicodeWriter: assert that max character <= MAX_UNICODE
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b96333ce4726..9ecf0e16d3c9 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13348,6 +13348,8 @@ _PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer,
     Py_ssize_t newlen;
     PyObject *newbuffer;
 
+    assert(maxchar <= MAX_UNICODE);
+
     /* ensure that the _PyUnicodeWriter_Prepare macro was used */
     assert((maxchar > writer->maxchar && length >= 0)
            || length > 0);
@@ -13441,6 +13443,7 @@ _PyUnicodeWriter_PrepareKindInternal(_PyUnicodeWriter *writer,
 Py_LOCAL_INLINE(int)
 _PyUnicodeWriter_WriteCharInline(_PyUnicodeWriter *writer, Py_UCS4 ch)
 {
+    assert(ch <= MAX_UNICODE);
     if (_PyUnicodeWriter_Prepare(writer, 1, ch) < 0)
         return -1;
     PyUnicode_WRITE(writer->kind, writer->data, writer->pos, ch);