rxvt-terminal: NullPointerException with infocmp warning, fixes #550

jline · Jul 6, 2020 · 3b0d5d5 · 3b0d5d5
1 parent d2ac4ef
commit 3b0d5d5
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 1 deletion.
diff --git a/terminal/src/main/java/org/jline/utils/Curses.java b/terminal/src/main/java/org/jline/utils/Curses.java
@@ -356,7 +356,7 @@ private static void doTputs(Appendable out, String str, Object... params) throws
                     }
                     break;
                 case '$':
-                    if (str.charAt(index) == '<') {
+                    if (index < length && str.charAt(index) == '<') {
                         // We don't honour delays, just skip
                         int nb = 0;
                         while ((ch = str.charAt(++index)) != '>') {

diff --git a/.../resources/org/jline/utils/rxvt-basic.cap → ...resources/org/jline/utils/rxvt-basic.caps b/.../resources/org/jline/utils/rxvt-basic.cap → ...resources/org/jline/utils/rxvt-basic.caps
diff --git a/...org/jline/utils/rxvt-unicode-256color.cap → ...rg/jline/utils/rxvt-unicode-256color.caps b/...org/jline/utils/rxvt-unicode-256color.cap → ...rg/jline/utils/rxvt-unicode-256color.caps
diff --git a/...esources/org/jline/utils/rxvt-unicode.cap → ...sources/org/jline/utils/rxvt-unicode.caps b/...esources/org/jline/utils/rxvt-unicode.cap → ...sources/org/jline/utils/rxvt-unicode.caps
diff --git a/...c/main/resources/org/jline/utils/rxvt.cap → .../main/resources/org/jline/utils/rxvt.caps b/...c/main/resources/org/jline/utils/rxvt.cap → .../main/resources/org/jline/utils/rxvt.caps