Merge remote-tracking branch

'origin/GP-5634-dragonmacher-find-structures' (Closes #8096)

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

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

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

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

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

@@ -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() {