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

GP-5008 - Fixed exception seen in Version Tracking

Browse source
This commit is contained in:
dragonmacher 2024-10-10 12:13:06 -04:00
parent 9108198ba7
commit 9579d9e145
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/CodeCompare/src/main/java/ghidra/features/codecompare/graphanalysis/DataGraph.java
View file

@ -325,14 +325,18 @@ public class DataGraph {
private void removeInEdge(DataVertex node, int inEdge) {
DataVertex inNode = node.sources.get(inEdge);
int outEdge;
for (outEdge = 0; outEdge < inNode.sinks.size(); ++outEdge) {
for (outEdge = 0; outEdge < inNode.sinks.size(); outEdge++) {
if (inNode.sinks.get(outEdge) == node) {
break;
}
}
node.sources.remove(inEdge);
int n = inNode.sinks.size();
if (n != 0) {
inNode.sinks.remove(outEdge);
}
}
/**
* Dump a string representation of the data-flow graph.

3
Ghidra/Features/CodeCompare/src/main/java/ghidra/features/codecompare/plugin/MultiFunctionComparisonPanel.java
View file

@ -29,6 +29,7 @@ import ghidra.features.base.codecompare.model.FunctionComparisonModelListener;
import ghidra.features.base.codecompare.panel.CodeComparisonPanel;
import ghidra.features.base.codecompare.panel.FunctionComparisonPanel;
import ghidra.framework.plugintool.PluginTool;
import ghidra.program.model.address.Address;
import ghidra.program.model.listing.Function;
import ghidra.util.datastruct.Duo;
import ghidra.util.datastruct.Duo.Side;
@ -228,7 +229,7 @@ public class MultiFunctionComparisonPanel extends FunctionComparisonPanel
String functionName = f.getName();
String functionPathToProgram = f.getProgram().getDomainFile().getPathname();
String functionAddress = f.getBody().getMinAddress().toString();
Address functionAddress = f.getEntryPoint();
String text = functionName + "@" + functionAddress + " (" + functionPathToProgram + ")";
return super.getListCellRendererComponent(list, text, index, isSelected, cellHasFocus);