Changeset 14135

Timestamp:

08/26/12 15:09:27 (8 years ago)

Author:

rschlatte

Message:

Catch out-of-bounds exception in standard-instance-access

• Reported by Pascal Costanza

File:

• trunk/abcl/src/org/armedbear/lisp/StandardObject.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/StandardObject.java

@@ -474 +474 @@
                               LispObject third)
     {
-      checkStandardObject(first).slots[Fixnum.getValue(second)] = third; // FIXME
+      final StandardObject instance = checkStandardObject(first);
+      final int index;
+      if (second instanceof Fixnum) {
+        index = ((Fixnum)second).value;
+      } else {
+        return type_error(second,
+                          list(Symbol.INTEGER, Fixnum.ZERO,
+                               Fixnum.getInstance(instance.slots.length)));
+      }
+
+      try {
+        instance.slots[index] = third;
+      } catch (ArrayIndexOutOfBoundsException e) {
+        return type_error(second,
+                          list(Symbol.INTEGER, Fixnum.ZERO,
+                               Fixnum.getInstance(instance.slots.length)));
+      }
       return third;
     }