spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-01 23:09:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51908
This commit is contained in:
Andy Wilkinson
2026-10-01 09:52:47 +01:00
parent a5bc294685 f6aa92821d
commit 616e64b4ae
2 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
+6 -1
View File
@@ -155,7 +155,12 @@ public class BasicJsonParser extends AbstractJsonParser {
build.setLength(0);
}
else if (ch == '\\') {
tracking.set(Tracked.ESCAPE, 1);
if (tracking.in(Tracked.OBJECT, Tracked.LIST)) {
build.append(ch);
}
else {
tracking.set(Tracked.ESCAPE, 1);
}
}
else {
build.append(ch);
core/spring-boot/src/test/java/org/springframework/boot/json/AbstractJsonParserTests.java
+70 -3
View File
@@ -175,10 +175,77 @@ abstract class AbstractJsonParserTests {
}
@Test
void escapeDoubleQuote() {
String input = "{\"foo\": \"\\\"bar\\\"\"}";
void escapeBackslash() {
String input = """
{
"a": "alpha\\\\"
}
""";
Map<String, Object> map = this.parser.parseMap(input);
assertThat(map).containsEntry("foo", "\"bar\"");
assertThat(map).containsEntry("a", "alpha\\");
}
@Test
void escapeDoubleQuote() {
String input = """
{
"a": "alpha\\\""
}
""";
Map<String, Object> map = this.parser.parseMap(input);
assertThat(map).containsEntry("a", "alpha\"");
}
@Test
void escapeBackslashInNestedMap() {
String input = """
{
"outer": {
"a": "alpha\\\\"
}
}
""";
Map<String, Object> map = this.parser.parseMap(input);
assertThat(map).extractingByKey("outer", InstanceOfAssertFactories.MAP).containsEntry("a", "alpha\\");
}
@Test
void escapeDoubleQuoteInNestedMap() {
String input = """
{
"outer": {
"a": "alpha\\\""
}
}
""";
Map<String, Object> map = this.parser.parseMap(input);
assertThat(map).extractingByKey("outer", InstanceOfAssertFactories.MAP).containsEntry("a", "alpha\"");
}
@Test
void escapeBackslashInNestedList() {
String input = """
{
"list": [
"alpha\\\\"
]
}
""";
Map<String, Object> map = this.parser.parseMap(input);
assertThat(map).extractingByKey("list", InstanceOfAssertFactories.LIST).containsExactly("alpha\\");
}
@Test
void escapeDoubleQuoteInNestedList() {
String input = """
{
"list": [
"alpha\\\""
]
}
""";
Map<String, Object> map = this.parser.parseMap(input);
assertThat(map).extractingByKey("list", InstanceOfAssertFactories.LIST).containsExactly("alpha\"");
}
@Test