Merge branch '6.1.x'

Author: bclozel

spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java

@@ -89,7 +89,12 @@ public ContentCachingRequestWrapper(HttpServletRequest request) {
 	public ContentCachingRequestWrapper(HttpServletRequest request, int contentCacheLimit) {
 		super(request);
 		int contentLength = request.getContentLength();
-		this.cachedContent = (contentLength > 0) ? new FastByteArrayOutputStream(contentLength) : new FastByteArrayOutputStream();
+		if (contentLength > 0) {
+			this.cachedContent = new FastByteArrayOutputStream(Math.min(contentLength, contentCacheLimit));
+		}
+		else {
+			this.cachedContent = new FastByteArrayOutputStream();
+		}
 		this.contentCacheLimit = contentCacheLimit;
 	}
 

spring-web/src/test/java/org/springframework/web/util/ContentCachingRequestWrapperTests.java

@@ -17,12 +17,15 @@
 package org.springframework.web.util;
 
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -89,6 +92,19 @@ void cachedContentToStringWithLimit() throws Exception {
 		assertThat(wrapper.getContentAsString()).isEqualTo(new String("Hel".getBytes(CHARSET), CHARSET));
 	}
 
+	@Test
+	void shouldNotAllocateMoreThanCacheLimit() throws Exception {
+		ContentCachingRequestWrapper wrapper = new ContentCachingRequestWrapper(createGetRequest("Hello World"), CONTENT_CACHE_LIMIT);
+		Field field = ReflectionUtils.findField(ContentCachingRequestWrapper.class, "cachedContent");
+		ReflectionUtils.makeAccessible(field);
+		FastByteArrayOutputStream cachedContent = (FastByteArrayOutputStream) ReflectionUtils.getField(field, wrapper);
+		field = ReflectionUtils.findField(FastByteArrayOutputStream.class, "initialBlockSize");
+		ReflectionUtils.makeAccessible(field);
+		int blockSize = (int) ReflectionUtils.getField(field, cachedContent);
+		assertThat(blockSize).isEqualTo(CONTENT_CACHE_LIMIT);
+	}
+
+
 	@Test
 	void cachedContentWithOverflow() throws Exception {
 		ContentCachingRequestWrapper wrapper = new ContentCachingRequestWrapper(