development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-01 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1660_ghidra007_updateApplyFunctionDefSigScripts_dtManSelection'

Browse source
This commit is contained in:
Ryan Kurtz 2022-04-26 14:20:41 -04:00
parent 144c273c51 40248f7157
commit 897419a927
2 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java
View file

@ -60,8 +60,7 @@ import ghidra.program.model.address.AddressSetView;
import ghidra.program.model.data.*; import ghidra.program.model.data.*;
import ghidra.program.model.listing.DataTypeArchive; import ghidra.program.model.listing.DataTypeArchive;
import ghidra.program.model.listing.Program; import ghidra.program.model.listing.Program;
import ghidra.util.HelpLocation; import ghidra.util.*;
import ghidra.util.Msg;
import ghidra.util.datastruct.LRUMap; import ghidra.util.datastruct.LRUMap;
import ghidra.util.task.TaskLauncher; import ghidra.util.task.TaskLauncher;
@ -612,9 +611,11 @@ public class DataTypeManagerPlugin extends ProgramPlugin
@Override @Override
public void setDataTypeSelected(DataType dataType) { public void setDataTypeSelected(DataType dataType) {
if (provider.isVisible()) { Swing.runIfSwingOrRunLater(() -> {
provider.setDataTypeSelected(dataType); if (provider.isVisible()) {
} provider.setDataTypeSelected(dataType);
}
});
} }
@Override @Override

52
Ghidra/Features/Decompiler/ghidra_scripts/ApplyClassFunctionDefinitionUpdatesScript.java
View file

@ -33,11 +33,9 @@ import java.util.List;
import classrecovery.RecoveredClassHelper; import classrecovery.RecoveredClassHelper;
import ghidra.app.script.GhidraScript; import ghidra.app.script.GhidraScript;
import ghidra.program.model.data.FunctionDefinition; import ghidra.app.services.DataTypeManagerService;
import ghidra.program.model.data.Structure; import ghidra.program.model.data.*;
import ghidra.program.model.listing.Function; import ghidra.program.model.listing.Function;
import ghidra.program.model.symbol.Namespace;
import ghidra.program.model.symbol.Symbol;
public class ApplyClassFunctionDefinitionUpdatesScript extends GhidraScript { public class ApplyClassFunctionDefinitionUpdatesScript extends GhidraScript {
@Override @Override
@ -51,28 +49,35 @@ public class ApplyClassFunctionDefinitionUpdatesScript extends GhidraScript {
RecoveredClassHelper classHelper = new RecoveredClassHelper(currentProgram, currentLocation, RecoveredClassHelper classHelper = new RecoveredClassHelper(currentProgram, currentLocation,
state.getTool(), this, false, false, false, false, monitor); state.getTool(), this, false, false, false, false, monitor);
Namespace classNamespace = classHelper.getClassNamespace(currentAddress); DataTypeManagerService dtms = state.getTool().getService(DataTypeManagerService.class);
if (classNamespace == null) { List<DataType> selectedDatatypes = dtms.getSelectedDatatypes();
println( if (selectedDatatypes.size() == 0) {
"Either cannot retrieve class namespace or cursor is not in a member of a class namepace"); println("Please select the class function definition(s) you wish to apply.");
return; return;
} }
List<Symbol> classVftableSymbols = classHelper.getClassVftableSymbols(classNamespace); List<FunctionDefinition> classFunctionDefinitions = new ArrayList<FunctionDefinition>();
if (classVftableSymbols.isEmpty()) { for (DataType selectedDataType : selectedDatatypes) {
println("There are no vftables in this class"); monitor.checkCanceled();
return;
if (!(selectedDataType instanceof FunctionDefinition)) {
continue;
}
FunctionDefinition functionDefinition = (FunctionDefinition) selectedDataType;
String pathName = functionDefinition.getPathName();
if (!pathName.contains("ClassDataTypes")) {
continue;
}
classFunctionDefinitions.add(functionDefinition);
} }
println(
"Applying differing function definitions for class " + classNamespace.getName(true));
List<FunctionDefinition> classFunctionDefinitions =
classHelper.getClassFunctionDefinitions(classNamespace);
if (classFunctionDefinitions.isEmpty()) { if (classFunctionDefinitions.isEmpty()) {
println("Class " + classNamespace.getName() + " has no function definitions to apply."); println(
"Selected function definition(s) must be in a subfolder of the ClassDataTypes folder in the DataTypeManager.");
return; return;
} }
List<Object> changedItems = new ArrayList<Object>(); List<Object> changedItems = new ArrayList<Object>();
for (FunctionDefinition functionDef : classFunctionDefinitions) { for (FunctionDefinition functionDef : classFunctionDefinitions) {
@ -84,14 +89,9 @@ public class ApplyClassFunctionDefinitionUpdatesScript extends GhidraScript {
} }
if (changedItems == null) { if (changedItems == null || changedItems.isEmpty()) {
println("Class " + classNamespace.getName() + " has no function definitions to apply."); println(
return; "There were no differences between the selected function definitions and the items that could be updated.");
}
if (changedItems.isEmpty()) {
println("No differences found for class " + classNamespace.getName(true) +
" between its function definition data types and the associated function signatures in the listing.");
return; return;
} }