commit 36991d8e26ebfcdbe1d00cc1f3b9c553d83bcadd
author Christopher Ferris <cferris@google.com> Fri Sep 18 18:02:36 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 18 18:02:36 2020 +0000
tree 5f97282d66399cdb35215a2995966d2d9737652a
parent 54ac48703162062b9f4682df3f865a122926f4b6
parent a293170a2cc65718cdbb37c7976e76fc9e7a8533

Merge "Fix x86_64 check for signal handler."

libunwindstack/RegsX86_64.cpp

diff --git a/libunwindstack/RegsX86_64.cpp b/libunwindstack/RegsX86_64.cpp
index c9e245d..26d9f65 100644
--- a/libunwindstack/RegsX86_64.cpp
+++ b/libunwindstack/RegsX86_64.cpp
@@ -141,15 +141,14 @@
     return false;
   }
 
-  uint16_t data2;
-  if (!elf_memory->ReadFully(elf_offset + 8, &data2, sizeof(data2)) || data2 != 0x0f05) {
+  uint8_t data2;
+  if (!elf_memory->ReadFully(elf_offset + 8, &data2, sizeof(data2)) || data2 != 0x05) {
     return false;
   }
 
   // __restore_rt:
   // 0x48 0xc7 0xc0 0x0f 0x00 0x00 0x00   mov $0xf,%rax
   // 0x0f 0x05                            syscall
-  // 0x0f                                 nopl 0x0($rax)
 
   // Read the mcontext data from the stack.
   // sp points to the ucontext data structure, read only the mcontext part.