Fix StringIndexOutOfBoundsException in -eval #25

birchb1024 · Apr 27, 2019 · da81b3b · da81b3b
1 parent 9499615
commit da81b3b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/org/genyris/interp/Interpreter.java b/src/org/genyris/interp/Interpreter.java
@@ -298,9 +298,11 @@ public Stack<Closure> resetDebugBackTrace() {
     }
 
     public Exp evalStringInGlobalEnvironment(String script) throws GenyrisException {
+        String truncatedScript = script;
+        if( script.length() > 9 )
+            truncatedScript = script.substring(0, 10) + "...";
         InStream is = new UngettableInStream(new ConvertEofInStream(new IndentStream(
-                new UngettableInStream(new ReaderInStream(new StringReader(script),
+                new UngettableInStream(new ReaderInStream(new StringReader(script), truncatedScript)), true)));
-                        script.substring(0, 10) + "...")), true)));
 
         Parser parser = newParser(is);
         parser.setUsualPrefixes(this);