Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-29 07:35:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-6792_dev747368_dont_auto_expand_chararray_strings_when_navigating--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-05-06 13:25:45 -04:00
parent 552850d2ae 5df7eac462
commit 5e9bd5f25e
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingPanel.java
+13 -3
View File
@@ -45,6 +45,7 @@ import ghidra.app.util.viewer.format.FieldHeader;
import ghidra.app.util.viewer.format.FormatManager; import ghidra.app.util.viewer.format.FormatManager;
import ghidra.app.util.viewer.util.*; import ghidra.app.util.viewer.util.*;
import ghidra.program.model.address.*; import ghidra.program.model.address.*;
import ghidra.program.model.data.StringDataInstance;
import ghidra.program.model.listing.*; import ghidra.program.model.listing.*;
import ghidra.program.model.symbol.*; import ghidra.program.model.symbol.*;
import ghidra.program.util.*; import ghidra.program.util.*;
@@ -834,7 +835,7 @@ public class ListingPanel extends JPanel implements FieldMouseListener, FieldLoc
Program program = getProgram(); Program program = getProgram();
CodeUnit cu = program.getListing().getCodeUnitContaining(address); CodeUnit cu = program.getListing().getCodeUnitContaining(address);
if (cu instanceof Data data) { if (cu instanceof Data data) {
openData(data, address); openDataAndShowComponentAtAddress(data, address);
} }
else if (cu instanceof Instruction instruction) { else if (cu instanceof Instruction instruction) {
openFunction(instruction); openFunction(instruction);
@@ -859,7 +860,7 @@ public class ListingPanel extends JPanel implements FieldMouseListener, FieldLoc
} }
} }
private void openData(Data data, Address address) { private void openDataAndShowComponentAtAddress(Data data, Address address) {
if (data.getComponent(0) == null) { if (data.getComponent(0) == null) {
// not sub data to open // not sub data to open
return; return;
@@ -870,10 +871,19 @@ public class ListingPanel extends JPanel implements FieldMouseListener, FieldLoc
return; return;
} }
if (subData != data && subData.getParentOffset() == 0 &&
StringDataInstance.isString(subData.getParent())) {
// if the primitive subData was the first char inside a char[], manipulate subData
// so that we skip opening the char[], but retain any parents that contain it.
subData = subData.getParent().getParent();
if (subData == null) {
return;
}
}
if (openAllData(subData)) { if (openAllData(subData)) {
layoutModel.dataChanged(true); layoutModel.dataChanged(true);
} }
} }
private FieldLocation getFieldLocationForDataAndOpenAsNeeded(Data data, Address address) { private FieldLocation getFieldLocationForDataAndOpenAsNeeded(Data data, Address address) {