development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-08-25 03:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-4426 - Fixed exception in the Structure Editor when searching while some columns have been removed

Browse source
This commit is contained in:
dragonmacher 2024-03-12 16:07:10 -04:00
parent ab6d50cab0
commit 21a25f5192
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java
View file

@ -1093,7 +1093,7 @@ public abstract class CompositeEditorPanel extends JPanel
private Integer findBackward(String text) {
String searchText = text.toLowerCase();
int colCount = model.getColumnCount();
int colCount = table.getColumnCount();
int currentRow = Math.max(0, model.getRow());
// search previous lines
@ -1117,16 +1117,20 @@ public abstract class CompositeEditorPanel extends JPanel
return null;
}
private boolean matchesSearch(String searchText, int row, int col) {
int modelCol = table.convertColumnIndexToModel(col);
Object valueAt = model.getValueAt(row, modelCol);
private boolean matchesSearch(String searchText, int viewRow, int viewCol) {
// Note: row is the same in view and model space; col is in view space and can differ from
// the model, since columns can be hidden in the view, but remain in the model.
int modelRow = viewRow;
int modelCol = table.convertColumnIndexToModel(viewCol);
Object valueAt = model.getValueAt(modelRow, modelCol);
if (valueAt == null) {
return false;
}
String value = getString(valueAt).toLowerCase();
if (modelCol == model.getNameColumn()) {
return nameMatchesSearch(searchText, row, value);
if (viewCol == model.getNameColumn()) {
return nameMatchesSearch(searchText, modelRow, value);
}
return value.contains(searchText);