commit 5f6524e9cfc279b6f9d9e50dad1fe8732352c861
author Christopher Ferris <cferris@google.com> Wed Dec 11 09:26:44 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 11 09:26:44 2024 -0800
tree e6087823b33701892bffc4ccd7761d21ba0a44c1
parent 824d62804bac03b1b6d3aecd662fc496b8a831eb
parent 0a6eca2d9aad6136502f81b7364059a188355c93

Merge "Fix use before set bug in arm32 guest." into main

debuggerd/crash_dump.cpp

diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index 00b861a..7d3830c 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -546,10 +546,10 @@
 #else
     case NATIVE_BRIDGE_ARCH_ARM: {
       unwindstack::arm_user_regs arm_user_regs = {};
-      regs->reset(unwindstack::RegsArm::Read(&arm_user_regs));
       for (size_t i = 0; i < unwindstack::ARM_REG_LAST; i++) {
         arm_user_regs.regs[i] = guest_regs.regs_arm.r[i];
       }
+      regs->reset(unwindstack::RegsArm::Read(&arm_user_regs));
 
       g_guest_arch = Architecture::ARM32;
       break;