Skip to content

Commit

Permalink
Avoid ArrayIndexOutOfBoundsException in SpEL's Indexer
Browse files Browse the repository at this point in the history
When index == arrayLength, the array index is also out of bounds.

For this scenario, a SpelEvaluationException should be thrown instead
of ArrayIndexOutOfBoundsException.

Closes gh-23658
  • Loading branch information
Joyce-Zhan authored and sbrannen committed Sep 19, 2019
1 parent b2704e1 commit fde7b1e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
Expand Up @@ -439,7 +439,7 @@ else if (arrayComponentType == Short.TYPE) {
}

private void checkAccess(int arrayLength, int index) throws SpelEvaluationException {
if (index > arrayLength) {
if (index >= arrayLength) {
throw new SpelEvaluationException(getStartPosition(), SpelMessage.ARRAY_INDEX_OUT_OF_BOUNDS,
arrayLength, index);
}
Expand Down
@@ -0,0 +1,23 @@
package org.springframework.expression.spel.ast;

import org.junit.jupiter.api.Test;
import org.springframework.expression.EvaluationException;
import org.springframework.expression.spel.standard.SpelExpression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.SimpleEvaluationContext;
import org.springframework.expression.spel.testresources.Inventor;

import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

/**
* @author Joyce Zhan
*/
public class IndexerTests {
@Test
public void testAccess() {
SimpleEvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
SpelExpression expression = (SpelExpression) new SpelExpressionParser().parseExpression("stringArrayOfThreeItems[3]");
assertThatExceptionOfType(EvaluationException.class).isThrownBy(() ->
expression.getValue(context, new Inventor()));
}
}

0 comments on commit fde7b1e

Please sign in to comment.