From 0028eb07a459352c157cea3a23cf21ca03dc22d2 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Tue, 30 Dec 2025 14:16:42 -0500 Subject: [PATCH 1/2] Fixed exception when finding references --- .../main/java/ghidra/program/model/data/AbstractDataType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.java index 637465df94..611496c712 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.java @@ -16,6 +16,7 @@ package ghidra.program.model.data; import java.util.Collection; +import java.util.Collections; import ghidra.docking.settings.Settings; import ghidra.program.model.mem.MemBuffer; @@ -182,7 +183,7 @@ public abstract class AbstractDataType implements DataType { @Override public Collection getParents() { // not-applicable - return null; + return Collections.emptyList(); } @Override From d45f5a2800e4d326ecf510418c8f32431a519083 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Tue, 30 Dec 2025 15:39:38 -0500 Subject: [PATCH 2/2] Test fixes --- .../ghidra/app/util/viewer/listingpanel/ListingPanelTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/listingpanel/ListingPanelTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/listingpanel/ListingPanelTest.java index f5437ae395..c86f691e43 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/listingpanel/ListingPanelTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/listingpanel/ListingPanelTest.java @@ -236,7 +236,7 @@ public class ListingPanelTest extends AbstractGhidraHeadedIntegrationTest { assertEquals(EolCommentFieldLocation.class, loc.getClass()); bfloc = (EolCommentFieldLocation) loc; assertEquals(0, bfloc.getRow()); - assertEquals(70, bfloc.getCharOffset()); + assertEquals(72, bfloc.getCharOffset()); } @Test @@ -273,7 +273,7 @@ public class ListingPanelTest extends AbstractGhidraHeadedIntegrationTest { assertEquals(EolCommentFieldLocation.class, loc.getClass()); bfloc = (EolCommentFieldLocation) loc; assertEquals(1, bfloc.getRow()); - assertEquals(42, bfloc.getCharOffset()); + assertEquals(43, bfloc.getCharOffset()); } @Test