mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-04 18:29:37 +02:00
GP-4781: Fix address space issues. Fix RegsProvider NPE.
This commit is contained in:
parent
ae18bdb413
commit
4e4a227221
2 changed files with 6 additions and 2 deletions
|
@ -1021,8 +1021,9 @@ public class DebuggerRegistersProvider extends ComponentProviderAdapter
|
|||
if (regs == null && register.getAddressSpace().isRegisterSpace()) {
|
||||
return false;
|
||||
}
|
||||
AddressRange range =
|
||||
current.getPlatform().getConventionalRegisterRange(regs.getAddressSpace(), register);
|
||||
AddressRange range = current.getPlatform()
|
||||
.getConventionalRegisterRange(regs == null ? null : regs.getAddressSpace(),
|
||||
register);
|
||||
return viewKnown.contains(range.getMinAddress(), range.getMaxAddress());
|
||||
}
|
||||
|
||||
|
|
|
@ -38,6 +38,9 @@ public abstract class ByteCache {
|
|||
if (!valid || start == null) {
|
||||
return false;
|
||||
}
|
||||
if (start.getAddressSpace() != address.getAddressSpace()) {
|
||||
return false;
|
||||
}
|
||||
long offset = address.subtract(start);
|
||||
return Long.compareUnsigned(offset + length, len) < 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue