Fix ansi stream state after an exception is thrown, fixes #30

fusesource · Dec 1, 2020 · 0926754 · 0926754
1 parent c77ec6c
commit 0926754
Showing 1 changed file with 33 additions and 6 deletions.
diff --git a/src/main/java/org/fusesource/jansi/AnsiOutputStream.java b/src/main/java/org/fusesource/jansi/AnsiOutputStream.java
@@ -128,7 +128,7 @@ public void write(int data) throws IOException {
                 } else if ('=' == data) {
                     options.add('=');
                 } else {
-                    reset(ap.processEscapeCommand(options, data));
+                    processEscapeCommand(data);
                 }
                 break;
             default:
@@ -143,7 +143,7 @@ public void write(int data) throws IOException {
                     if (data == ';') {
                         state = LOOKING_FOR_NEXT_ARG;
                     } else {
-                        reset(ap.processEscapeCommand(options, data));
+                        processEscapeCommand(data);
                     }
                 }
                 break;
@@ -156,7 +156,7 @@ public void write(int data) throws IOException {
                     if (data == ';') {
                         state = LOOKING_FOR_NEXT_ARG;
                     } else {
-                        reset(ap.processEscapeCommand(options, data));
+                        processEscapeCommand(data);
                     }
                 }
                 break;
@@ -192,7 +192,7 @@ public void write(int data) throws IOException {
                 if (BEL == data) {
                     String value = new String(buffer, startOfValue, (pos - 1) - startOfValue, cs);
                     options.add(value);
-                    reset(ap.processOperatingSystemCommand(options));
+                    processOperatingSystemCommand();
                 } else if (FIRST_ESC_CHAR == data) {
                     state = LOOKING_FOR_ST;
                 } else {
@@ -205,15 +205,15 @@ public void write(int data) throws IOException {
                 if (SECOND_ST_CHAR == data) {
                     String value = new String(buffer, startOfValue, (pos - 2) - startOfValue, cs);
                     options.add(value);
-                    reset(ap.processOperatingSystemCommand(options));
+                    processOperatingSystemCommand();
                 } else {
                     state = LOOKING_FOR_OSC_PARAM;
                 }
                 break;
 
             case LOOKING_FOR_CHARSET:
                 options.add((char) data);
-                reset(ap.processCharsetSelect(options));
+                processCharsetSelect();
                 break;
         }
 
@@ -223,6 +223,33 @@ public void write(int data) throws IOException {
         }
     }
 
+    private void processCharsetSelect() throws IOException {
+        try {
+            reset(ap.processCharsetSelect(options));
+        } catch (RuntimeException e) {
+            reset(true);
+            throw e;
+        }
+    }
+
+    private void processOperatingSystemCommand() throws IOException {
+        try {
+            reset(ap.processOperatingSystemCommand(options));
+        } catch (RuntimeException e) {
+            reset(true);
+            throw e;
+        }
+    }
+
+    private void processEscapeCommand(int data) throws IOException {
+        try {
+            reset(ap.processEscapeCommand(options, data));
+        } catch (RuntimeException e) {
+            reset(true);
+            throw e;
+        }
+    }
+
     /**
      * Resets all state to continue with regular parsing
      * @param skipBuffer if current buffer should be skipped or written to out