summaryrefslogtreecommitdiff
path: root/disassembler/disassembler_x86.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2014-12-16 18:04:15 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-12-16 18:04:15 +0000
commitbeb0a4e897a40201202436af290f77db036760a4 (patch)
tree8d6179698403e404810fbdd4e76b91c1c6c00211 /disassembler/disassembler_x86.cc
parent08c7ac664bdf9f471b54e3894a6d16d08d5e5c7c (diff)
parent6a0b920512b72542b3f1a3d232fba7ded45ea455 (diff)
Merge "Fix crash in x86 disassembler."
Diffstat (limited to 'disassembler/disassembler_x86.cc')
-rw-r--r--disassembler/disassembler_x86.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/disassembler/disassembler_x86.cc b/disassembler/disassembler_x86.cc
index b58f5fa3c5..1a768c8b86 100644
--- a/disassembler/disassembler_x86.cc
+++ b/disassembler/disassembler_x86.cc
@@ -171,7 +171,7 @@ std::string DisassemblerX86::DumpAddress(uint8_t mod, uint8_t rm, uint8_t rex64,
std::ostringstream address;
if (mod == 0 && rm == 5) {
if (!supports_rex_) { // Absolute address.
- *address_bits = *reinterpret_cast<const uint32_t*>(**instr);
+ *address_bits = *reinterpret_cast<const uint32_t*>(*instr);
address << StringPrintf("[0x%x]", *address_bits);
} else { // 64-bit RIP relative addressing.
address << StringPrintf("[RIP + 0x%x]", *reinterpret_cast<const uint32_t*>(*instr));