From a45662b575832f42d9eec438efd06df5248db145 Mon Sep 17 00:00:00 2001 From: Martin Mirchev Date: Wed, 18 Nov 2026 21:41:36 +0800 Subject: [PATCH 1/2] Ignore indexed parameter names without closing bracket in DataBinder During constructor binding, DataBinder.getIndexes() and createMap() look for the closing bracket of a parameter name such as "list[0]" or "map[key]" and use the result of indexOf(']') without checking it. A request parameter whose name is missing the bracket, such as "list[35" or "map[key", therefore fails with a StringIndexOutOfBoundsException, and the request ends with a 500 error instead of the parameter being ignored. Skip such names, as is already done for other names that do not match the indexed form. Signed-off-by: Martin Mirchev --- .../validation/DataBinder.java | 6 +++++ .../validation/DataBinderConstructTests.java | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java index 69d56d2be832..5611151949f1 100644 --- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java +++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java @@ -1122,6 +1122,9 @@ private boolean hasValuesFor(String paramPath, ValueResolver resolver) { int startIdx = paramPath.length() + 1; int endIdx = name.indexOf(']', startIdx); + if (endIdx == -1) { + continue; + } boolean quoted = (endIdx - startIdx > 2 && name.charAt(startIdx) == '\'' && name.charAt(endIdx - 1) == '\''); String key = (quoted ? name.substring(startIdx + 1, endIdx - 1) : name.substring(startIdx, endIdx)); @@ -1183,6 +1186,9 @@ else if (map.containsKey(key)) { } else { int endIndex = name.indexOf(']', paramPath.length() + 2); + if (endIndex == -1) { + continue; + } String indexValue = name.substring(paramPath.length() + 1, endIndex); index = Integer.parseInt(indexValue); } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java index d8e372839ed3..9c2c3dc4092e 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java @@ -225,6 +225,28 @@ void simpleListBindingEmptyBrackets() { assertThat(target.integerList()).containsExactly(1); } + @Test + void simpleListBindingIgnoresUnclosedIndex() { + MapValueResolver valueResolver = new MapValueResolver(Map.of("integerList[0]", "1", "integerList[35", "2")); + + DataBinder binder = initDataBinder(IntegerListRecord.class); + binder.construct(valueResolver); + + IntegerListRecord target = getTarget(binder); + assertThat(target.integerList()).containsExactly(1); + } + + @Test + void simpleMapBindingIgnoresUnclosedKey() { + MapValueResolver valueResolver = new MapValueResolver(Map.of("integerMap[a]", "1", "integerMap[b", "2")); + + DataBinder binder = initDataBinder(IntegerMapRecord.class); + binder.construct(valueResolver); + + IntegerMapRecord target = getTarget(binder); + assertThat(target.integerMap()).hasSize(1).containsEntry("a", 1); + } + @Test void simpleMapBinding() { MapValueResolver valueResolver = new MapValueResolver(Map.of("integerMap[a]", "1", "integerMap[b]", "2")); From 091e06e69cd753fe96eb53738bb4df9d96bb2b21 Mon Sep 17 00:00:00 2001 From: Martin Mirchev Date: Thu, 19 Nov 2026 21:42:49 +0800 Subject: [PATCH 2/2] Ignore non-numeric or out-of-range indexes in DataBinder An index that Integer.parseInt() rejects, such as integerList[abc] or integerList[99999999999], threw a NumberFormatException from getIndexes(). Skip such parameter names, as for an index without a closing bracket. Signed-off-by: Martin Mirchev --- .../org/springframework/validation/DataBinder.java | 7 ++++++- .../validation/DataBinderConstructTests.java | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java index 5611151949f1..a41631b01878 100644 --- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java +++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java @@ -1190,7 +1190,12 @@ else if (map.containsKey(key)) { continue; } String indexValue = name.substring(paramPath.length() + 1, endIndex); - index = Integer.parseInt(indexValue); + try { + index = Integer.parseInt(indexValue); + } + catch (NumberFormatException ex) { + continue; + } } indexes = (indexes != null ? indexes : new TreeSet<>()); indexes.add(index); diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java index 9c2c3dc4092e..6c1480682c48 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java @@ -236,6 +236,18 @@ void simpleListBindingIgnoresUnclosedIndex() { assertThat(target.integerList()).containsExactly(1); } + @Test + void simpleListBindingIgnoresNonNumericOrOutOfRangeIndex() { + MapValueResolver valueResolver = new MapValueResolver(Map.of( + "integerList[0]", "1", "integerList[abc]", "2", "integerList[99999999999]", "3")); + + DataBinder binder = initDataBinder(IntegerListRecord.class); + binder.construct(valueResolver); + + IntegerListRecord target = getTarget(binder); + assertThat(target.integerList()).containsExactly(1); + } + @Test void simpleMapBindingIgnoresUnclosedKey() { MapValueResolver valueResolver = new MapValueResolver(Map.of("integerMap[a]", "1", "integerMap[b", "2"));