Merge branch 'master' of https://github.com/pre10der89/ChakraCore int…

…o chakra_nuget
pre10der89 · Jan 5, 2017 · 6432af3 · 6432af3
2 parents bfec5a6 + 71a87b0
commit 6432af3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/Common/Codex/Utf8Codex.cpp b/lib/Common/Codex/Utf8Codex.cpp
@@ -397,7 +397,9 @@ namespace utf8
 LSlowPath:
         while (cch-- > 0)
         {
-            *buffer++ = Decode(ptr, ptr + 4, localOptions); // WARNING: Assume cch correct, suppress end-of-buffer checking
+            LPCUTF8 end = ptr + cch + 1; // WARNING: Assume cch correct, suppress end-of-buffer checking
+
+            *buffer++ = Decode(ptr, end, localOptions);
             if (ShouldFastPath(ptr, buffer)) goto LFastPath;
         }
     }
@@ -466,7 +468,9 @@ namespace utf8
         DecodeOptions localOptions = options;
         while (cch-- > 0)
         {
-            if (*pch++ != utf8::Decode(bch, bch + 4, localOptions)) // WARNING: Assume cch correct, suppress end-of-buffer checking
+            LPCUTF8 end = bch + cch + 1; // WARNING: Assume cch correct, suppress end-of-buffer checking
+
+            if (*pch++ != utf8::Decode(bch, end, localOptions))
                 return false;
         }
         return true;

diff --git a/lib/Parser/HashFunc.cpp b/lib/Parser/HashFunc.cpp
@@ -31,7 +31,11 @@ ULONG CaseSensitiveComputeHashCch(LPCUTF8 prgch, int32 cch)
     ULONG luHash = 0;
 
     while (cch-- > 0)
-        luHash = 17 * luHash + utf8::Decode(prgch, prgch + 4, options); // WARNING: Assume cch correct, suppress end-of-buffer checking
+    {
+        LPCUTF8 end = prgch + cch + 1; // WARNING: Assume cch correct, suppress end-of-buffer checking
+
+        luHash = 17 * luHash + utf8::Decode(prgch, end, options);
+    }
     return luHash;
 }