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-0_Dan_testFixes-2023-01-10-1'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-01-10 11:49:31 -05:00
parent 1a36ad806e a66412f026
commit 58ccc22076
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
View File

@@ -915,6 +915,9 @@ public class DebuggerListingProvider extends CodeViewerProvider {
}
protected void cleanMissingModuleMessages(Set<Trace> affectedTraces) {
if (consoleService == null) {
return;
}
nextCtx: for (ActionContext ctx : consoleService.getActionContexts()) {
if (!(ctx instanceof DebuggerMissingModuleActionContext mmCtx)) {
continue;

7
Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetObject.java
View File

@@ -198,7 +198,7 @@ public class DefaultTargetObject<E extends TargetObject, P extends TargetObject>
@Override
public Map<String, E> getCachedElements() {
synchronized (model.lock) {
return Map.copyOf(elements);
return elements == null ? Map.of() : Map.copyOf(elements);
}
}
@@ -394,7 +394,7 @@ public class DefaultTargetObject<E extends TargetObject, P extends TargetObject>
@Override
public Map<String, ?> getCachedAttributes() {
synchronized (model.lock) {
return Map.copyOf(attributes);
return attributes == null ? Map.of() : Map.copyOf(attributes);
}
}
@@ -406,7 +406,8 @@ public class DefaultTargetObject<E extends TargetObject, P extends TargetObject>
@Override
public Object getCachedAttribute(String name) {
synchronized (model.lock) {
return attributes.get(name);
// Could get called during object's constructor
return attributes == null ? null : attributes.get(name);
}
}