Changeset 41167 in vbox

Timestamp:

May 4, 2012 1:33:33 PM (13 years ago)

Author:

vboxsync

Message:

Runtime/uniread: first check the range, then access the array

File:

• trunk/src/VBox/Runtime/common/string/uniread.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/uniread.cpp

@@ -1077 +1077 @@
         /* figure how far off the next chunk is */
         unsigned iSameCase = i;
-        while (     g_aCPInfo[iSameCase].SimpleUpperCaseMapping == g_aCPInfo[iSameCase].CodePoint
-               &&   iSameCase < RT_ELEMENTS(g_aCPInfo)
+        while (     iSameCase < RT_ELEMENTS(g_aCPInfo)
+               &&   g_aCPInfo[iSameCase].SimpleUpperCaseMapping == g_aCPInfo[iSameCase].CodePoint
                &&   iSameCase >= 256)
             iSameCase++;
@@ -1124 +1124 @@
         /* figure how far off the next chunk is */
         unsigned iSameCase = i;
-        while (     g_aCPInfo[iSameCase].SimpleLowerCaseMapping == g_aCPInfo[iSameCase].CodePoint
-               &&   iSameCase < RT_ELEMENTS(g_aCPInfo)
+        while (     iSameCase < RT_ELEMENTS(g_aCPInfo)
+               &&   g_aCPInfo[iSameCase].SimpleLowerCaseMapping == g_aCPInfo[iSameCase].CodePoint
                &&   iSameCase >= 256)
             iSameCase++;