From 1d7b6fdb2c992f7ac6c24701e11264e52ef83a0d Mon Sep 17 00:00:00 2001 From: Skylot Date: Thu, 18 Aug 2022 15:59:45 +0100 Subject: [PATCH] fix(gui): additional checks on open search result (#1647) --- .../java/jadx/gui/ui/dialog/CommonSearchDialog.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java index fd4c5252..eb62a2df 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java @@ -150,11 +150,16 @@ public abstract class CommonSearchDialog extends JFrame { @Nullable private JNode getSelectedNode() { - int selectedId = resultsTable.getSelectedRow(); - if (selectedId == -1) { + try { + int selectedId = resultsTable.getSelectedRow(); + if (selectedId == -1 || selectedId >= resultsTable.getRowCount()) { + return null; + } + return (JNode) resultsModel.getValueAt(selectedId, 0); + } catch (Exception e) { + LOG.error("Failed to get results table selected object", e); return null; } - return (JNode) resultsModel.getValueAt(selectedId, 0); } @Override -- GitLab