jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(gui): prevent unlimited recursion in text search (#2685) (PR #2694)

Browse Source
This commit is contained in:
Jan S.
2025-11-06 21:34:42 +01:00
committed by GitHub
parent 05863881f8
commit cda1b1ad2c
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java
+3 -9
View File
@@ -33,7 +33,7 @@ public class SearchBar extends JToolBar {
private static final Logger LOG = LoggerFactory.getLogger(SearchBar.class);
private static final int MAX_RESULT_COUNT = 999;
private RSyntaxTextArea rTextArea;
private final RSyntaxTextArea rTextArea;
private final JTextField searchField;
private final JLabel resultCountLabel;
@@ -185,6 +185,7 @@ public class SearchBar extends JToolBar {
context.setRegularExpression(regex);
context.setSearchForward(forward);
context.setWholeWord(wholeWord);
context.setSearchWrap(true);
// We enable Mark All even if the corresponding toggle button is off,
// this is a bit hackish, but it's the only way to count matches through SearchEngine
@@ -215,14 +216,7 @@ public class SearchBar extends JToolBar {
notFound = !result.wasFound();
if (notFound) {
int pos = SearchEngine.getNextMatchPos(searchText, rTextArea.getText(), forward, matchCase, wholeWord);
if (pos != -1) {
rTextArea.setCaretPosition(forward ? 0 : rTextArea.getDocument().getLength() - 1);
search(direction);
searchField.putClientProperty("JComponent.outline", "warning");
} else {
searchField.putClientProperty("JComponent.outline", "error");
}
searchField.putClientProperty("JComponent.outline", "error");
} else {
searchField.putClientProperty("JComponent.outline", "");
}