Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in calculation of maximum form part size

Browse Source 
See gh-31343
This commit is contained in:
Arjen Poutsma
2023-11-06 11:20:18 +01:00
parent b3a6dbaab3
commit efb93ca109
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-web/src/main/java/org/springframework/http/codec/multipart/PartEventHttpMessageReader.java
View File

@@ -191,7 +191,14 @@ public class PartEventHttpMessageReader extends LoggingCodecSupport implements H
private Publisher<? extends PartEvent> createEvents(HttpHeaders headers, Flux<MultipartParser.BodyToken> bodyTokens) {
if (MultipartUtils.isFormField(headers)) {
Flux<DataBuffer> contents = bodyTokens.map(MultipartParser.BodyToken::buffer);
int maxSize = (int) Math.min(this.maxInMemorySize, this.maxPartSize);
int maxSize;
if (this.maxPartSize == -1) {
maxSize = this.maxInMemorySize;
}
else {
// maxInMemorySize is an int, so we can safely cast the long result of Math.min
maxSize = (int) Math.min(this.maxInMemorySize, this.maxPartSize);
}
return DataBufferUtils.join(contents, maxSize)
.map(content -> {
String value = content.toString(MultipartUtils.charset(headers));
@@ -222,8 +229,13 @@ public class PartEventHttpMessageReader extends LoggingCodecSupport implements H
}
private boolean tooLarge(AtomicLong partSize, DataBuffer buffer) {
long size = partSize.addAndGet(buffer.readableByteCount());
return this.maxPartSize > 0 && size > this.maxPartSize;
if (this.maxPartSize != -1) {
long size = partSize.addAndGet(buffer.readableByteCount());
return size > this.maxPartSize;
}
else {
return false;
}
}
}