Changeset 3822

Timestamp:

09/16/03 16:54:30 (19 years ago)

Author:

piso

Message:

getEndOfOutput(): bulletproofing around accesses to posEndOfOutput.

File:

• trunk/j/src/org/armedbear/j/CommandInterpreter.java (modified) (10 diffs)

trunk/j/src/org/armedbear/j/CommandInterpreter.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2003 Peter Graves
- * $Id: CommandInterpreter.java,v 1.18 2003-05-16 17:43:01 piso Exp $
+ * $Id: CommandInterpreter.java,v 1.19 2003-09-16 16:54:30 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -89 +89 @@
     public final synchronized Position getEndOfOutput()
     {
+        if (posEndOfOutput != null) {
+            if (posEndOfOutput.getOffset() > posEndOfOutput.getLineLength()) {
+                Log.debug("posEndOfOutput adjusting offset");
+                posEndOfOutput.setOffset(posEndOfOutput.getLineLength());
+            }
+        }
         return posEndOfOutput;
     }
@@ -133 +139 @@
         final Editor editor = Editor.currentEditor();
         final Line dotLine = editor.getDotLine();
-        if (posEndOfOutput == null) {
+        if (getEndOfOutput() == null) {
             // Ignore input before first prompt is displayed.
             dotLine.setText("");
@@ -217 +223 @@
     {
         Editor editor = Editor.currentEditor();
-        if (editor.getMark() != null || posEndOfOutput == null ||
+        if (editor.getMark() != null || getEndOfOutput() == null ||
             editor.getDot().isBefore(posEndOfOutput)) {
             // There's a marked block, or we're not at the command line.
@@ -267 +273 @@
     protected void backspace()
     {
-        if (posEndOfOutput == null)
+        if (getEndOfOutput() == null)
             return;
         boolean ok = true;
@@ -300 +306 @@
     private void getInputFromHistory(int direction)
     {
-        if (posEndOfOutput == null) {
+        if (getEndOfOutput() == null) {
             // No prompt yet.
             return;
@@ -313 +319 @@
             history.reset();
 
-        Position begin = posEndOfOutput.copy();
+        Position begin = getEndOfOutput().copy();
         Position end = getEnd();
         Region r = new Region(editor.getBuffer(), begin, end);
@@ -329 +335 @@
             CompoundEdit compoundEdit = beginCompoundEdit();
             editor.addUndo(SimpleEdit.MOVE);
-            editor.setDot(posEndOfOutput.copy());
+            editor.setDot(getEndOfOutput().copy());
             editor.setMark(getEnd());
             editor.deleteRegion();
@@ -340 +346 @@
             resetUndo();
         }
-        for (Line line = posEndOfOutput.getLine(); line != null; line = line.next())
+        for (Line line = getEndOfOutput().getLine(); line != null; line = line.next())
             line.setFlags(STATE_INPUT);
         editor.setCurrentCommand(COMMAND_HISTORY);
@@ -361 +367 @@
                     renumber();
                 enforceOutputLimit(Property.SHELL_OUTPUT_LIMIT);
-                posEndOfOutput = pos.copy();
+                setEndOfOutput(pos.copy());
             } else {
                 setText(s);
-                posEndOfOutput = getEnd().copy();
+                setEndOfOutput(getEnd().copy());
             }
         }