commit 46aed739555d2f821691b323d46de7ad7a75d5e7
author Benjamin Kramer <benny.kra@googlemail.com> Mon Aug 20 10:52:11 2012 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Mon Aug 20 10:52:11 2012 +0000
tree 0577d6fc0b1c7248e0b691f22a7a86f6cb54c690
parent bee05dc8408d363335bb623a4f3349ff90639d35

DataExtractor: Fix integer truncation issues in LEB128 extraction.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162201 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Support/DataExtractor.cpp

diff --git a/lib/Support/DataExtractor.cpp b/lib/Support/DataExtractor.cpp
index dc21155..3d5cce0 100644
--- a/lib/Support/DataExtractor.cpp
+++ b/lib/Support/DataExtractor.cpp
@@ -139,7 +139,7 @@
 
   while (isValidOffset(offset)) {
     byte = Data[offset++];
-    result |= (byte & 0x7f) << shift;
+    result |= uint64_t(byte & 0x7f) << shift;
     shift += 7;
     if ((byte & 0x80) == 0)
       break;
@@ -160,7 +160,7 @@
 
   while (isValidOffset(offset)) {
     byte = Data[offset++];
-    result |= (byte & 0x7f) << shift;
+    result |= uint64_t(byte & 0x7f) << shift;
     shift += 7;
     if ((byte & 0x80) == 0)
       break;
@@ -168,7 +168,7 @@
 
   // Sign bit of byte is 2nd high order bit (0x40)
   if (shift < 64 && (byte & 0x40))
-    result |= -(1 << shift);
+    result |= -(1ULL << shift);
 
   *offset_ptr = offset;
   return result;