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

Commit d83952c4 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 am: 062fea20 

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



Change-Id: Iaa11ac6e20be402e49d5d1826302bd7a5458ff18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a599755 062fea20

debuggerd/crash_dump.cpp

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