GP-2295 - fixes and debug code for a history actions stack trace

This commit is contained in:
dragonmacher 2022-07-14 11:31:27 -04:00
parent b8425e804d
commit c8e15f0fe2
6 changed files with 133 additions and 95 deletions

View file

@ -90,7 +90,7 @@ public interface Navigatable {
* Return true if this Navigatable is part of the "dynamic analysis" or "debugger" user
* interface.
*
* @return tre if this Navigatable is "dynamic"
* @return true if this Navigatable is "dynamic"
*/
default public boolean isDynamic() {
return false;
@ -166,9 +166,9 @@ public interface Navigatable {
public void removeNavigatableListener(NavigatableRemovalListener listener);
/**
* Returns true if this navigatable is no longer valid, false if it is still good
* Returns true if this navigatable is no longer valid
*
* @return true if this navigatable is no longer valid, false if it is still good
* @return true if this navigatable is no longer valid
*/
public boolean isDisposed();

View file

@ -627,12 +627,18 @@ public class NavigationHistoryPlugin extends Plugin
}
private Function getPreviousStartFunction(Navigatable navigatable) {
ProgramLocation location = navigatable.getLocation();
ProgramLocation location = getProgramLocation(navigatable);
if (location == null) {
return null;
}
Address currentAddress = location.getAddress();
Program program = location.getProgram();
FunctionManager functionManager = program.getFunctionManager();
return functionManager.getFunctionContaining(currentAddress);
}
private ProgramLocation getProgramLocation(Navigatable navigatable) {
//
// The active component may still be showing the previously loaded function, instead
@ -643,19 +649,49 @@ public class NavigationHistoryPlugin extends Plugin
// that the navigation actions will sometimes feel inconsistent, depending upon
// what view is focused.
//
DockingWindowManager manager = DockingWindowManager.getActiveInstance();
ComponentProvider provider = manager.getActiveComponentProvider();
if (provider instanceof Navigatable) {
LocationMemento memento = ((Navigatable) provider).getMemento();
ProgramLocation otherLocation = memento.getProgramLocation();
if (otherLocation != null) {
currentAddress = otherLocation.getAddress();
DockingWindowManager dwm = DockingWindowManager.getActiveInstance();
ComponentProvider activeProvider = dwm.getActiveComponentProvider();
if (activeProvider instanceof Navigatable) {
Navigatable activeNavigatable = (Navigatable) activeProvider;
LocationMemento memento = activeNavigatable.getMemento();
ProgramLocation location =
validateProgramLocation(activeNavigatable, memento.getProgramLocation());
if (location != null) {
// prefer the active natigatable's location
return location;
}
}
ProgramLocation location = navigatable.getLocation();
return validateProgramLocation(navigatable, location);
}
private ProgramLocation validateProgramLocation(Navigatable navigatable,
ProgramLocation location) {
if (location == null) {
return null;
}
if (isClosedProgram(navigatable, location)) {
return null;
}
return location;
}
// TODO debug code that can go away if we find the source of the lingering program location
// being used that causes the program closed exception
private boolean isClosedProgram(Navigatable navigatable, ProgramLocation location) {
Program program = location.getProgram();
FunctionManager functionManager = program.getFunctionManager();
return functionManager.getFunctionContaining(currentAddress);
if (program.isClosed()) {
Msg.showError(this, null, "Closed Program",
"The Navigation History Plugin is using a closed program.\n" + "Program: " +
program.getName() + "Navigatable: " +
navigatable.getClass().getSimpleName() + "\n" + "Location: " +
location.getClass().getSimpleName() + " @ " + location.getAddress());
return true;
}
return false;
}
void remove(LocationMemento location) {

View file

@ -30,28 +30,17 @@ import ghidra.util.SystemUtilities;
/**
* Visible Plugin to show ByteBlock data in various formats.
*/
@PluginInfo(
status = PluginStatus.RELEASED,
packageName = CorePluginPackage.NAME,
category = PluginCategoryNames.BYTE_VIEWER,
shortDescription = "Displays bytes in memory",
description = "Provides a component for showing the bytes in memory. " +
@PluginInfo(status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, category = PluginCategoryNames.BYTE_VIEWER, shortDescription = "Displays bytes in memory", description = "Provides a component for showing the bytes in memory. " +
"Additional plugins provide capabilites for this plugin" +
" to show the bytes in various formats (e.g., hex, octal, decimal)." +
" The hex format plugin is loaded by default when this plugin is loaded.",
servicesRequired = {
" The hex format plugin is loaded by default when this plugin is loaded.", servicesRequired = {
ProgramManager.class, GoToService.class, NavigationHistoryService.class,
ClipboardService.class,
},
eventsConsumed = {
ProgramLocationPluginEvent.class, ProgramActivatedPluginEvent.class,
ProgramSelectionPluginEvent.class, ProgramHighlightPluginEvent.class,
ProgramClosedPluginEvent.class, ByteBlockChangePluginEvent.class,
},
eventsProduced = {
ClipboardService.class, }, eventsConsumed = { ProgramLocationPluginEvent.class,
ProgramActivatedPluginEvent.class, ProgramSelectionPluginEvent.class,
ProgramHighlightPluginEvent.class, ProgramClosedPluginEvent.class,
ByteBlockChangePluginEvent.class, }, eventsProduced = {
ProgramLocationPluginEvent.class, ProgramSelectionPluginEvent.class,
ByteBlockChangePluginEvent.class,
})
ByteBlockChangePluginEvent.class, })
public class ByteViewerPlugin extends AbstractByteViewerPlugin<ProgramByteViewerComponentProvider> {
public ByteViewerPlugin(PluginTool tool) {
@ -73,6 +62,7 @@ public class ByteViewerPlugin extends AbstractByteViewerPlugin<ProgramByteViewer
if (event instanceof ProgramActivatedPluginEvent) {
currentProgram = ((ProgramActivatedPluginEvent) event).getActiveProgram();
currentLocation = null;
}
else if (event instanceof ProgramLocationPluginEvent) {
currentLocation = ((ProgramLocationPluginEvent) event).getLocation();
@ -131,8 +121,7 @@ public class ByteViewerPlugin extends AbstractByteViewerPlugin<ProgramByteViewer
}
@Override
public void highlightChanged(ByteViewerComponentProvider provider,
ProgramSelection highlight) {
public void highlightChanged(ByteViewerComponentProvider provider, ProgramSelection highlight) {
if (provider == connectedProvider) {
tool.firePluginEvent(new ProgramHighlightPluginEvent(getName(), highlight,
connectedProvider.getProgram()));

View file

@ -74,9 +74,15 @@ public class DecompilePlugin extends Plugin {
* or when switching program tabs.
*/
SwingUpdateManager delayedLocationUpdateMgr = new SwingUpdateManager(200, 200, () -> {
if (currentLocation != null) {
connectedProvider.setLocation(currentLocation, null);
if (currentLocation == null) {
return;
}
Program locationProgram = currentLocation.getProgram();
if (locationProgram.isClosed()) {
return; // not sure if this can happen
}
connectedProvider.setLocation(currentLocation, null);
});
public DecompilePlugin(PluginTool tool) {

View file

@ -497,6 +497,13 @@ public class FGProvider extends VisualGraphComponentProvider<FGVertex, FGEdge, F
return;
}
Program program = newLocation.getProgram();
if (program.isClosed()) {
// this method is called from an update manager, which means that the callback may
// happen after the notification that the program was closed
return;
}
setLocationNow(newLocation);
}