commit c9631a14d77bd34a7c0ecf1cb1e5f8983b76d48f
author Serhiy Storchaka <storchaka@gmail.com> Tue Jan 08 22:43:18 2013 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Tue Jan 08 22:43:18 2013 +0200
tree 52db1ec92dc0d7c3cbc2efeefb50b1f3bb0d3156
parent be2b907ce2252785e257a9642f36e95e297ae449

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

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b4c37fb..7713b54 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2272,7 +2272,7 @@
     /* 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