mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-03 09:49:23 +02:00
Merge remote-tracking branch 'origin/Ghidra_11.3'
This commit is contained in:
commit
409efdfaee
2 changed files with 1 additions and 4 deletions
|
@ -1105,7 +1105,7 @@ public class BitFieldPlacementComponent extends JPanel implements Scrollable {
|
||||||
int allocationEndOffset = offset + allocationBytes - 1;
|
int allocationEndOffset = offset + allocationBytes - 1;
|
||||||
|
|
||||||
int numComponents = struct.getNumComponents();
|
int numComponents = struct.getNumComponents();
|
||||||
DataTypeComponent component = struct.getDefinedComponentAtOrAfterOffset(offset);
|
DataTypeComponent component = struct.getComponentContaining(offset);
|
||||||
while (component != null) {
|
while (component != null) {
|
||||||
if (component.getOffset() > allocationEndOffset) {
|
if (component.getOffset() > allocationEndOffset) {
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -195,9 +195,6 @@ public class CompEditorPanel extends CompositeEditorPanel {
|
||||||
model.setSelection(new int[] { dtc.getOrdinal() });
|
model.setSelection(new int[] { dtc.getOrdinal() });
|
||||||
table.scrollToSelectedRow();
|
table.scrollToSelectedRow();
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
model.setSelection(new FieldSelection());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue