root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

MultipartParser should respect read position 

This commit ensures that the MultipartParser takes a buffer's read
position into account.

Closes gh-31110
This commit is contained in:
Arjen Poutsma 2023-09-15 13:46:04 +02:00
parent 54c4f1b226
commit 8f130316d2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
View File

@ -523,7 +523,7 @@ final class MultipartParser extends BaseSubscriber<DataBuffer> {
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
logger.trace("Boundary found @" + endIdx + " in " + buffer); logger.trace("Boundary found @" + endIdx + " in " + buffer);
} }
int len = endIdx - this.boundaryLength + 1; int len = endIdx - this.boundaryLength + 1 - boundaryBuffer.readPosition();
if (len > 0) { if (len > 0) {
// whole boundary in buffer. // whole boundary in buffer.
// slice off the body part, and flush // slice off the body part, and flush
@ -538,10 +538,11 @@ final class MultipartParser extends BaseSubscriber<DataBuffer> {
DataBufferUtils.release(boundaryBuffer); DataBufferUtils.release(boundaryBuffer);
DataBuffer prev; DataBuffer prev;
while ((prev = this.queue.pollLast()) != null) { while ((prev = this.queue.pollLast()) != null) {
int prevLen = prev.readableByteCount() + len; int prevByteCount = prev.readableByteCount();
int prevLen = prevByteCount + len;
if (prevLen > 0) { if (prevLen > 0) {
// slice body part of previous buffer, and flush it // slice body part of previous buffer, and flush it
DataBuffer body = prev.split(prevLen); DataBuffer body = prev.split(prevLen + prev.readPosition());
DataBufferUtils.release(prev); DataBufferUtils.release(prev);
enqueue(body); enqueue(body);
flush(); flush();
@ -550,7 +551,7 @@ final class MultipartParser extends BaseSubscriber<DataBuffer> {
else { else {
// previous buffer only contains boundary bytes // previous buffer only contains boundary bytes
DataBufferUtils.release(prev); DataBufferUtils.release(prev);
len += prev.readableByteCount(); len += prevByteCount;
} }
} }
} }