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

Merge remote-tracking branch

Browse source 
'origin/GP-5634-dragonmacher-find-structures' (Closes #8096)
This commit is contained in:
Ryan Kurtz 2025-05-05 17:53:18 -04:00
commit e209136396
3 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/FindDataTypesBySizeAction.java
View file

@ -92,6 +92,10 @@ public class FindDataTypesBySizeAction extends DockingAction {
DataTypeNode dataTypeNode = (DataTypeNode) node;
DataType dt = dataTypeNode.getDataType();
int length = dt.getLength();
if (dt.isZeroLength()) {
length = 0;
}
for (Range range : sizes) {
if (range.contains(length)) {
return true;

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/FindStructuresBySizeAction.java
View file

@ -70,6 +70,10 @@ public class FindStructuresBySizeAction extends FindDataTypesBySizeAction {
Structure structure = (Structure) dataType;
int length = structure.getLength();
if (structure.isZeroLength()) {
length = 0;
}
for (Range range : sizes) {
if (range.contains(length)) {
return true;

19
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPluginTest.java
View file

@ -852,6 +852,25 @@ public class DataTypeManagerPluginTest extends AbstractGhidraHeadedIntegrationTe
assertMatchingStructures(resultsProvider, "Structure_0x8");
}
@Test
public void testAction_FindStructureBySize_Empty() {
StructureDataType stuct = new StructureDataType("Structure_Empty", 0);
builder.addDataType(stuct);
DockingActionIf action = getAction(plugin, FindStructuresBySizeAction.NAME);
performAction(action, false);
NumberRangeInputDialog dialog = waitForDialogComponent(NumberRangeInputDialog.class);
setText(dialog, "0");
pressButtonByText(dialog, "OK");
DataTypesProvider resultsProvider =
waitForComponentProvider(DataTypesProvider.class, FindStructuresBySizeAction.NAME);
assertMatchingStructures(resultsProvider, "Structure_Empty");
}
@Test
public void testAction_FindStructureBySize_Ranage() {