[lldb/MachO] "Fix" intentional out-of-bounds error (NFC)

Remove the hack that populates the cpsr register in the gpr struct by
writing past the end of the array. This was tripping up ASan.

Patch by: Reva Cuthbertson
This commit is contained in:
Jonas Devlieghere 2019-12-18 12:49:46 -08:00
parent 1946461344
commit e194d89012
2 changed files with 8 additions and 6 deletions

View File

@ -479,12 +479,13 @@ public:
switch (flavor) {
case GPRAltRegSet:
case GPRRegSet:
for (uint32_t i = 0; i < count; ++i) {
// On ARM, the CPSR register is also included in the count but it is
// not included in gpr.r so loop until (count-1).
for (uint32_t i = 0; i < (count - 1); ++i) {
gpr.r[i] = data.GetU32(&offset);
}
// Note that gpr.cpsr is also copied by the above loop; this loop
// technically extends one element past the end of the gpr.r[] array.
// Save cpsr explicitly.
gpr.cpsr = data.GetU32(&offset);
SetError(GPRRegSet, Read, 0);
offset = next_thread_state;

View File

@ -1140,10 +1140,11 @@ bool RegisterContextDarwin_arm::ReadRegister(const RegisterInfo *reg_info,
case gpr_sp:
case gpr_lr:
case gpr_pc:
case gpr_cpsr:
value.SetUInt32(gpr.r[reg - gpr_r0]);
break;
case gpr_cpsr:
value.SetUInt32(gpr.cpsr);
break;
case fpu_s0:
case fpu_s1:
case fpu_s2: