yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

fixed stack trace when exporting

Browse source
This commit is contained in:
ghidravore 2020-11-25 13:11:16 -05:00
parent 4300bec382
commit 1259632113
5 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/graph/AddressBasedGraphDisplayListener.java
View file

@ -222,7 +222,8 @@ public abstract class AddressBasedGraphDisplayListener
graphDisplay.updateVertexName(vertex, displayName); graphDisplay.updateVertexName(vertex, displayName);
} }
private void dispose() { @Override
public void dispose() {
Swing.runLater(() -> tool.removeListenerForAllPluginEvents(this)); Swing.runLater(() -> tool.removeListenerForAllPluginEvents(this));
program.removeListener(this); program.removeListener(this);
} }

11
Ghidra/Features/GraphServices/src/main/java/ghidra/graph/export/ExportAttributedGraphDisplay.java
View file

@ -39,6 +39,7 @@ class ExportAttributedGraphDisplay implements GraphDisplay {
private final PluginTool pluginTool; private final PluginTool pluginTool;
private String title; private String title;
private AttributedGraph graph;
/** /**
* Create the initial display, the graph-less visualization viewer, and its controls * Create the initial display, the graph-less visualization viewer, and its controls
@ -55,7 +56,8 @@ class ExportAttributedGraphDisplay implements GraphDisplay {
@Override @Override
public void setGraphDisplayListener(GraphDisplayListener listener) { public void setGraphDisplayListener(GraphDisplayListener listener) {
// This display is not interactive, so N/A // This display is not interactive, so just dispose the listener
listener.dispose();
} }
@ -86,10 +88,11 @@ class ExportAttributedGraphDisplay implements GraphDisplay {
} }
@Override @Override
public void setGraph(AttributedGraph graphData, String title, boolean append, public void setGraph(AttributedGraph graph, String title, boolean append,
TaskMonitor monitor) { TaskMonitor monitor) {
this.title = title; this.title = title;
doSetGraphData(graphData); this.graph = graph;
doSetGraphData(graph);
} }
/** /**
@ -132,7 +135,7 @@ class ExportAttributedGraphDisplay implements GraphDisplay {
@Override @Override
public AttributedGraph getGraph() { public AttributedGraph getGraph() {
return null; return graph;
} }
@Override @Override

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/DummyGraphDisplayListener.java
View file

@ -39,4 +39,9 @@ public class DummyGraphDisplayListener implements GraphDisplayListener {
// I'm a dummy // I'm a dummy
} }
@Override
public void dispose() {
// I'm a dummy
}
} }

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/GraphDisplayListener.java
View file

@ -49,4 +49,9 @@ public interface GraphDisplayListener {
*/ */
public GraphDisplayListener cloneWith(GraphDisplay graphDisplay); public GraphDisplayListener cloneWith(GraphDisplay graphDisplay);
/**
* Tells the listener that it is no longer needed and it can release any listeners/resources
*/
public void dispose();
} }

5
Ghidra/Test/IntegrationTest/src/test/java/ghidra/graph/GraphActionTest.java
View file

@ -303,6 +303,11 @@ public class GraphActionTest extends AbstractGhidraHeadedIntegrationTest {
return new TestGraphDisplayListener("clone"); return new TestGraphDisplayListener("clone");
} }
@Override
public void dispose() {
// do nothing
}
} }
private AttributedGraph createGraph() { private AttributedGraph createGraph() {