Fix out of bound read in UTF-32 decoder on "narrow Unicode" builds.

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b4c37fb464050f42a454e007a543d2d26ae57438..7713b5497e1d7f920ca43565084107bf8a5f3600 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2272,7 +2272,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
     /* On narrow builds we split characters outside the BMP into two
        codepoints => count how much extra space we need. */
 #ifndef Py_UNICODE_WIDE
-    for (qq = q; qq < e; qq += 4)
+    for (qq = q; e - qq >= 4; qq += 4)
         if (qq[iorder[2]] != 0 || qq[iorder[3]] != 0)
             pairs++;
 #endif