diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2012-08-20 10:52:11 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2012-08-20 10:52:11 +0000 |
| commit | 1b07ab51e421a1598acc15e0cdaa4576aa610cb6 (patch) | |
| tree | 960007e22cecd4710d24623c51c3e8732c6c750c /llvm/lib | |
| parent | 6e98cdebf4f2491b5d366d72ccb9b98d1373ff22 (diff) | |
| download | bcm5719-llvm-1b07ab51e421a1598acc15e0cdaa4576aa610cb6.tar.gz bcm5719-llvm-1b07ab51e421a1598acc15e0cdaa4576aa610cb6.zip | |
DataExtractor: Fix integer truncation issues in LEB128 extraction.
llvm-svn: 162201
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Support/DataExtractor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Support/DataExtractor.cpp b/llvm/lib/Support/DataExtractor.cpp index dc21155a062..3d5cce05358 100644 --- a/llvm/lib/Support/DataExtractor.cpp +++ b/llvm/lib/Support/DataExtractor.cpp @@ -139,7 +139,7 @@ uint64_t DataExtractor::getULEB128(uint32_t *offset_ptr) const { 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 @@ int64_t DataExtractor::getSLEB128(uint32_t *offset_ptr) const { 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 @@ int64_t DataExtractor::getSLEB128(uint32_t *offset_ptr) const { // 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; |
