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

GP-5634 - Fixed 'Find Structures by Size...' to find zero-length

Browse source 
structures
This commit is contained in:
dragonmacher 2025-05-05 16:52:25 -04:00
parent 939a8f979c
commit 17d0a83d51
3 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -92,6 +92,10 @@ public class FindDataTypesBySizeAction extends DockingAction {
DataTypeNode dataTypeNode = (DataTypeNode) node; DataTypeNode dataTypeNode = (DataTypeNode) node;
DataType dt = dataTypeNode.getDataType(); DataType dt = dataTypeNode.getDataType();
int length = dt.getLength(); int length = dt.getLength();
if (dt.isZeroLength()) {
length = 0;
}
for (Range range : sizes) { for (Range range : sizes) {
if (range.contains(length)) { if (range.contains(length)) {
return true; return true;

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

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -70,6 +70,10 @@ public class FindStructuresBySizeAction extends FindDataTypesBySizeAction {
Structure structure = (Structure) dataType; Structure structure = (Structure) dataType;
int length = structure.getLength(); int length = structure.getLength();
if (structure.isZeroLength()) {
length = 0;
}
for (Range range : sizes) { for (Range range : sizes) {
if (range.contains(length)) { if (range.contains(length)) {
return true; 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"); 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 @Test
public void testAction_FindStructureBySize_Ranage() { public void testAction_FindStructureBySize_Ranage() {