Merge pull request #2329 from adamretter/hotfix/xq-array-oobe-4.x.x

(4.x.x) Fix an ArrayOutOfBoundException with array:get

Author: dizzzz

src/org/exist/xquery/functions/array/ArrayFunction.java

@@ -249,7 +249,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathExce
                         return new IntegerValue(array.getSize());
                     case GET:
                         final IntegerValue index = (IntegerValue) args[1].itemAt(0);
-                        return array.get(index.getInt() - 1);
+                        return array.get(index);
                     case APPEND:
                         return array.append(args[1]);
                     case HEAD:

src/org/exist/xquery/functions/array/ArrayType.java

@@ -68,13 +68,15 @@ public Sequence get(int n) {
     }
 
     @Override
-    public Sequence get(AtomicValue key) throws XPathException {
+    public Sequence get(final AtomicValue key) throws XPathException {
         if (!Type.subTypeOf(key.getType(), Type.INTEGER)) {
-            throw new XPathException(ErrorCodes.XPTY0004, "position argument for array lookup must be a positive integer");
+            throw new XPathException(ErrorCodes.XPTY0004, "Position argument for array lookup must be a positive integer");
         }
         final int pos = ((IntegerValue)key).getInt();
         if (pos <= 0 || pos > getSize()) {
-            throw new XPathException(ErrorCodes.XPTY0004, "position argument for array lookup must be > 0 and < array:size");
+            final String startIdx = vector.length() == 0 ? "0" : "1";
+            final String endIdx = String.valueOf(vector.length());
+            throw new XPathException(ErrorCodes.FOAY0001, "Array index " + pos + " out of bounds (" + startIdx + ".." + endIdx + ")");
         }
         return get(pos - 1);
     }

test/src/xquery/arrays/arrays.xql

@@ -134,6 +134,63 @@ function arr:function-item-invalid() {
         $a("x")
 };
 
+declare
+    %test:assertError("FOAY0001")
+function arr:get-item-out-of-bounds-positive() {
+    let $a := [13, 10, 14]
+    return
+        array:get($a, 4)
+};
+
+declare
+    %test:assertError("FOAY0001")
+function arr:get-item-out-of-bounds-positive-large() {
+    let $a := [13, 10, 14]
+    return
+        array:get($a, 22)
+};
+
+declare
+    %test:assertError("FOAY0001")
+function arr:get-item-out-of-bounds-zero() {
+    let $a := [13, 10, 14]
+    return
+        array:get($a, 0)
+};
+
+declare
+    %test:assertError("FOAY0001")
+function arr:get-item-out-of-bounds-negative() {
+    let $a := [13, 10, 14]
+    return
+        array:get($a, -1)
+};
+
+declare
+    %test:pending("eXist-db does not correctly detect the type error. This is likely a larger issue than just arrays.")
+    %test:assertError("XPTY0004")
+function arr:get-invalid-type() {
+    let $a := [13, 10, 14]
+    return
+        array:get($a, xs:double(0.1))
+};
+
+declare
+    %test:assertEquals(13)
+function arr:get-first() {
+    let $a := [13, 10, 14]
+    return
+        array:get($a, 1)
+};
+
+declare
+    %test:assertEquals(14)
+function arr:get-last() {
+    let $a := [13, 10, 14]
+    return
+        array:get($a, 3)
+};
+
 declare
     %test:args(1)
     %test:assertEmpty