mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4217_Dan_fixCrashDisassemblingGuestPlatform'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-02-15 11:20:25 -05:00
parent 08155a7183 eb16898b32
commit f75ca5cb8a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTraceGuestPlatform.java
View File

@@ -310,6 +310,9 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
@Override @Override
public Address mapHostToGuest(Address hostAddress) { public Address mapHostToGuest(Address hostAddress) {
if (hostAddress == null) {
return null;
}
try (LockHold hold = LockHold.lock(manager.lock.readLock())) { try (LockHold hold = LockHold.lock(manager.lock.readLock())) {
Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry = Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry =
rangesByHostAddress.floorEntry(hostAddress); rangesByHostAddress.floorEntry(hostAddress);
@@ -322,6 +325,9 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
@Override @Override
public AddressRange mapHostToGuest(AddressRange hostRange) { public AddressRange mapHostToGuest(AddressRange hostRange) {
if (hostRange == null) {
return null;
}
try (LockHold hold = LockHold.lock(manager.lock.readLock())) { try (LockHold hold = LockHold.lock(manager.lock.readLock())) {
Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry = Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry =
rangesByHostAddress.floorEntry(hostRange.getMinAddress()); rangesByHostAddress.floorEntry(hostRange.getMinAddress());
@@ -350,6 +356,9 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
@Override @Override
public Address mapGuestToHost(Address guestAddress) { public Address mapGuestToHost(Address guestAddress) {
if (guestAddress == null) {
return null;
}
try (LockHold hold = LockHold.lock(manager.lock.readLock())) { try (LockHold hold = LockHold.lock(manager.lock.readLock())) {
Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry = Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry =
rangesByGuestAddress.floorEntry(guestAddress); rangesByGuestAddress.floorEntry(guestAddress);
@@ -362,6 +371,9 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
@Override @Override
public AddressRange mapGuestToHost(AddressRange guestRange) { public AddressRange mapGuestToHost(AddressRange guestRange) {
if (guestRange == null) {
return null;
}
try (LockHold hold = LockHold.lock(manager.lock.readLock())) { try (LockHold hold = LockHold.lock(manager.lock.readLock())) {
Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry = Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry =
rangesByGuestAddress.floorEntry(guestRange.getMinAddress()); rangesByGuestAddress.floorEntry(guestRange.getMinAddress());