Browse Source

Disable array allocation in case of no constructor resolution

See gh-28808
Closes gh-33386

(cherry picked from commit a3a48a241c)
5.3.x
Juergen Hoeller 3 years ago committed by Sam Brannen
parent
commit
f44d13cb78
  1. 9
      spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
  2. 20
      spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java

9
spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -268,6 +268,13 @@ public class ConstructorReference extends SpelNodeImpl {
} }
String type = (String) intendedArrayType; String type = (String) intendedArrayType;
if (state.getEvaluationContext().getConstructorResolvers().isEmpty()) {
// No constructor resolver -> no array construction either (as of 5.3.38)
throw new SpelEvaluationException(getStartPosition(), SpelMessage.CONSTRUCTOR_NOT_FOUND,
type + "[]", "[]");
}
Class<?> componentType; Class<?> componentType;
TypeCode arrayTypeCode = TypeCode.forName(type); TypeCode arrayTypeCode = TypeCode.forName(type);
if (arrayTypeCode == TypeCode.OBJECT) { if (arrayTypeCode == TypeCode.OBJECT) {

20
spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,17 +18,21 @@ package org.springframework.expression.spel;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression; import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.SimpleEvaluationContext;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/** /**
* Test construction of arrays. * Test construction of arrays.
* *
* @author Andy Clement * @author Andy Clement
* @author Sam Brannen * @author Sam Brannen
* @author Juergen Hoeller
*/ */
class ArrayConstructorTests extends AbstractExpressionTests { class ArrayConstructorTests extends AbstractExpressionTests {
@ -97,7 +101,7 @@ class ArrayConstructorTests extends AbstractExpressionTests {
void typeArrayConstructors() { void typeArrayConstructors() {
evaluate("new String[]{'a','b','c','d'}[1]", "b", String.class); evaluate("new String[]{'a','b','c','d'}[1]", "b", String.class);
evaluateAndCheckError("new String[]{'a','b','c','d'}.size()", SpelMessage.METHOD_NOT_FOUND, 30, "size()", evaluateAndCheckError("new String[]{'a','b','c','d'}.size()", SpelMessage.METHOD_NOT_FOUND, 30, "size()",
"java.lang.String[]"); "java.lang.String[]");
evaluate("new String[]{'a','b','c','d'}.length", 4, Integer.class); evaluate("new String[]{'a','b','c','d'}.length", 4, Integer.class);
} }
@ -110,10 +114,18 @@ class ArrayConstructorTests extends AbstractExpressionTests {
void multiDimensionalArrays() { void multiDimensionalArrays() {
evaluate("new String[2][2]", "[Ljava.lang.String;[2]{[2]{null,null},[2]{null,null}}", String[][].class); evaluate("new String[2][2]", "[Ljava.lang.String;[2]{[2]{null,null},[2]{null,null}}", String[][].class);
evaluate("new String[3][2][1]", evaluate("new String[3][2][1]",
"[[Ljava.lang.String;[3]{[2]{[1]{null},[1]{null}},[2]{[1]{null},[1]{null}},[2]{[1]{null},[1]{null}}}", "[[Ljava.lang.String;[3]{[2]{[1]{null},[1]{null}},[2]{[1]{null},[1]{null}},[2]{[1]{null},[1]{null}}}",
String[][][].class); String[][][].class);
} }
@Test
void noArrayConstruction() {
EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().build();
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
parser.parseExpression("new int[2]").getValue(context));
}
private void evaluateArrayBuildingExpression(String expression, String expectedToString) { private void evaluateArrayBuildingExpression(String expression, String expectedToString) {
SpelExpressionParser parser = new SpelExpressionParser(); SpelExpressionParser parser = new SpelExpressionParser();
Expression e = parser.parseExpression(expression); Expression e = parser.parseExpression(expression);

Loading…
Cancel
Save