commit dec798eb46f7edfe0995ce1b8966097fb7567eb7
author Serhiy Storchaka <storchaka@gmail.com> Tue Jan 08 22:45:42 2013 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Tue Jan 08 22:45:42 2013 +0200
tree bb25a84c298781f53e8f0dee5323aacb254cc274
parent f6fd794fac1b6af754d233875c173afb5ca9c45e

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 f8c738b..7cd0399 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3182,7 +3182,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