Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5008-dragonmacher-vt-exception'

Browse Source 
(Closes #7028)
This commit is contained in:
Ryan Kurtz 2024-10-10 14:09:20 -04:00
commit 065a845d4a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Features/CodeCompare/src/main/java/ghidra/features/codecompare/graphanalysis/DataGraph.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -325,13 +325,17 @@ 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);
inNode.sinks.remove(outEdge);
int n = inNode.sinks.size();
if (n != 0) {
inNode.sinks.remove(outEdge);
}
}
/**

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);