i-search crashes with default setup, fixes #58

jline · Dec 9, 2016 · d6ac0de · d6ac0de
1 parent 65d06a0
commit d6ac0de
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -2193,6 +2193,10 @@ protected boolean historyIncrementalSearchBackward() {
     }
 
     protected boolean doSearchHistory(boolean backward) {
+        if (history.isEmpty()) {
+            return false;
+        }
+
         BufferImpl originalBuffer = buf.copy();
         String previousSearchTerm = (searchTerm != null) ? searchTerm.toString() : "";
         searchTerm = new StringBuffer(buf.toString());

diff --git a/src/test/java/org/jline/reader/impl/HistorySearchTest.java b/src/test/java/org/jline/reader/impl/HistorySearchTest.java
@@ -116,4 +116,15 @@ public void testAbortingAfterSearchingPreviousLinesGivesBlank() throws Exception
         assertEquals("", reader.getBuffer().toString());
         assertEquals(3, history.size());
     }
+
+    @Test
+    public void testSearchOnEmptyHistory() throws Exception {
+        DefaultHistory history = setupHistory();
+        history.purge();
+
+        String readLineResult;
+        in.setIn(new ByteArrayInputStream(translate("^Sa").getBytes()));
+        readLineResult = reader.readLine();
+        assertEquals(null, readLineResult);
+    }
 }