Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / courgette / disassembler_win32_x64.cc

diff --git a/src/courgette/disassembler_win32_x64.cc b/src/courgette/disassembler_win32_x64.cc
index 1da5951..04356d7 100644 (file)
--- a/src/courgette/disassembler_win32_x64.cc
+++ b/src/courgette/disassembler_win32_x64.cc
@@ -573,7 +573,9 @@ CheckBool DisassemblerWin32X64::ParseFileRegion(
 
     if (abs32_pos != abs32_locations_.end() && *abs32_pos == current_rva) {
       uint32 target_address = Read32LittleEndian(p);
-      RVA target_rva = target_address - image_base();
+      // TODO(wfh): image_base() can be larger than 32 bits, so this math can
+      // underflow.  Figure out the right solution here.
+      RVA target_rva = target_address - static_cast<uint32>(image_base());
       // TODO(sra): target could be Label+offset.  It is not clear how to guess
       // which it might be.  We assume offset==0.
       if (!program->EmitAbs32(program->FindOrMakeAbs32Label(target_rva)))