Fix negative array index lookup overflow messages (Fixes #1188)

EngineHub · May 22, 2020 · 5813d34 · 5813d34
1 parent 52316a7
commit 5813d34
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/main/java/com/laytonsmith/core/functions/ArrayHandling.java b/src/main/java/com/laytonsmith/core/functions/ArrayHandling.java
@@ -171,9 +171,17 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 						//Convert negative indexes
 						if(start < 0) {
 							start = ca.size() + start;
+							if(start < 0) {
+								throw new CREIndexOverflowException("The element at index \""
+										+ ((CSlice) index).getStart() + "\" does not exist", t);
+							}
 						}
 						if(finish < 0) {
 							finish = ca.size() + finish;
+							if(finish < 0) {
+								throw new CREIndexOverflowException("The element at index \""
+										+ ((CSlice) index).getFinish() + "\" does not exist", t);
+							}
 						}
 						CArray na = ca.createNew(t);
 						if(finish < start) {
@@ -201,6 +209,10 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 							if(iindex < 0) {
 								//negative index, convert to positive index
 								iindex = ca.size() + iindex;
+								if(iindex < 0) {
+									throw new CREIndexOverflowException("The element at index \"" + index.val()
+											+ "\" does not exist", t);
+								}
 							}
 							return ca.get(iindex, t);
 						} else {