github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-12-30 17:48:42 -05:00
parent 6560dbcf56 59f361983f
commit bbb884b5b2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/viewer/listingpanel/ListingPanelTest.java
View File

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

3
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.java
View File

@@ -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<DataType> getParents() {
// not-applicable
return null;
return Collections.emptyList();
}
@Override