Merge remote-tracking branch 'origin/GP-1_fixed_issue_exposed_by_change_in_GP-4820'

ryanmkurtz · ryanmkurtz · commit 0d490ef98dc4 · 2024-12-16T15:33:16.000-05:00
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingPanel.java
@@ -1142,7 +1142,7 @@ public void setSelection(ProgramSelection sel, EventTrigger trigger) {
 					BigInteger index2 = loc2.getIndex();
 					int fieldNum2 = layout.getEndRowFieldNum(loc2.getFieldNum());
 					if (fieldNum2 >= layout2.getNumFields()) {
-						index2 = loc2.getIndex().add(BigInteger.valueOf(layout2.getIndexSize()));
+						index2 = loc2.getIndex().add(BigInteger.ONE);
 						fieldNum2 = 0;
 					}
 					fieldSel.addRange(new FieldLocation(loc1.getIndex(), fieldNum1, 0, 0),

Original file line number	Diff line number	Diff line change
`@@ -1142,7 +1142,7 @@ public void setSelection(ProgramSelection sel, EventTrigger trigger) {`
`1142`	`1142`	`BigInteger index2 = loc2.getIndex();`
`1143`	`1143`	`int fieldNum2 = layout.getEndRowFieldNum(loc2.getFieldNum());`
`1144`	`1144`	`if (fieldNum2 >= layout2.getNumFields()) {`
`1145`		`- index2 = loc2.getIndex().add(BigInteger.valueOf(layout2.getIndexSize()));`
	`1145`	`+ index2 = loc2.getIndex().add(BigInteger.ONE);`
`1146`	`1146`	`fieldNum2 = 0;`
`1147`	`1147`	`}`
`1148`	`1148`	`fieldSel.addRange(new FieldLocation(loc1.getIndex(), fieldNum1, 0, 0),`