Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 062fea20 authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Fix use before set bug in arm32 guest." into main am: 5f6524e9 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3403428



Change-Id: Ic4fe17dd0fd9c2962c5cbe8908891eeef78d3f88
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f274d414 5f6524e9

debuggerd/crash_dump.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -546,10 +546,10 @@ static void ReadGuestRegisters(std::unique_ptr<unwindstack::Regs>* regs, pid_t t 
#else

#else

    case NATIVE_BRIDGE_ARCH_ARM: {

    case NATIVE_BRIDGE_ARCH_ARM: {

      unwindstack::arm_user_regs arm_user_regs = {};

      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++) {

      for (size_t i = 0; i < unwindstack::ARM_REG_LAST; i++) {

        arm_user_regs.regs[i] = guest_regs.regs_arm.r[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;

      g_guest_arch = Architecture::ARM32;

      break;

      break;