Merge branch '3.0.x'

Closes gh-35367
spring-projects · May 9, 2023 · 0f1870e · 0f1870e
2 parents 87d8340 + 077f61b
commit 0f1870e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...oject/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java b/...oject/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java
@@ -67,6 +67,7 @@ protected Yaml createYaml() {
 		loaderOptions.setAllowDuplicateKeys(false);
 		loaderOptions.setMaxAliasesForCollections(Integer.MAX_VALUE);
 		loaderOptions.setAllowRecursiveKeys(true);
+		loaderOptions.setCodePointLimit(Integer.MAX_VALUE);
 		return createYaml(loaderOptions);
 	}
 

diff --git a/.../spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java b/.../spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
@@ -182,6 +182,18 @@ void loadWhenUsingAnchors() {
 		assertThat(loaded.get("some.anotherpath.config.key")).hasToString("value");
 	}
 
+	@Test
+	void canLoadFilesBiggerThan3Mb() {
+		StringBuilder yaml = new StringBuilder();
+		while (yaml.length() < 4_194_304) {
+			yaml.append("- some list entry\n");
+		}
+		Resource resource = new ByteArrayResource(yaml.toString().getBytes(StandardCharsets.UTF_8));
+		this.loader = new OriginTrackedYamlLoader(resource);
+		Map<String, Object> loaded = this.loader.load().get(0);
+		assertThat(loaded).isNotEmpty();
+	}
+
 	private OriginTrackedValue getValue(String name) {
 		if (this.result == null) {
 			this.result = this.loader.load();