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

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index f8c738bc75f898eff571f138b1c6be78ee625ca6..7cd039990c7cdb203710314534ca12bb538f51ca 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3182,7 +3182,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