diff options
author | Rui Ueyama <ruiu@google.com> | 2014-02-20 19:14:56 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2014-02-20 19:14:56 +0000 |
commit | f41901d32ca141550e639d875638c828d3d65466 (patch) | |
tree | 81485a9b38b8d4939dbd605699c1bc9750da0958 /lib | |
parent | 3e552a331ba38481176cbec40c4eb3b35a73439e (diff) | |
download | llvm-f41901d32ca141550e639d875638c828d3d65466.tar.gz llvm-f41901d32ca141550e639d875638c828d3d65466.tar.bz2 llvm-f41901d32ca141550e639d875638c828d3d65466.tar.xz |
Object/COFF: Fix possible truncation bug.
VA can be 64 bit, as the image base can be larger than 4GB, so we need to
handle 64 bit VAs properly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201803 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Object/COFFObjectFile.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp index ede784379f..a3931b3b0e 100644 --- a/lib/Object/COFFObjectFile.cpp +++ b/lib/Object/COFFObjectFile.cpp @@ -19,6 +19,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" #include <cctype> +#include <cstdint> using namespace llvm; using namespace object; @@ -382,9 +383,11 @@ error_code COFFObjectFile::initSymbolTablePtr() { } // Returns the file offset for the given VA. -error_code COFFObjectFile::getVaPtr(uint32_t Addr, uintptr_t &Res) const { - uint32_t ImageBase = PE32Header ? PE32Header->ImageBase : (uint32_t)PE32PlusHeader->ImageBase; - return getRvaPtr(Addr - ImageBase, Res); +error_code COFFObjectFile::getVaPtr(uint64_t Addr, uintptr_t &Res) const { + uint64_t ImageBase = PE32Header ? PE32Header->ImageBase : PE32PlusHeader->ImageBase; + uint64_t Rva = Addr - ImageBase; + assert(Rva <= UINT32_MAX); + return getRvaPtr((uint32_t)Rva, Res); } // Returns the file offset for the given RVA. |