Skip to content

Ensure buffer is always released from HTTP/3 HeadersGenerator in case of failure. #13549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lachlan-roberts merged 1 commit into from
Sep 9, 2025
Merged

Ensure buffer is always released from HTTP/3 HeadersGenerator in case of failure. #13549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .../jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/HeadersGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ private int generateHeadersFrame(ByteBufferPool.Accumulator accumulator, long st
int maxHeaderLength = frameTypeLength + VarLenInt.MAX_LENGTH;
// The capacity of the buffer is larger than maxLength, but we need to enforce at most maxLength.
int maxLength = encoder.getMaxHeadersSize();

// Acquire buffer and immediately append to the accumulator so that it is released if a failure occurs.
RetainableByteBuffer buffer = getByteBufferPool().acquire(maxHeaderLength + maxLength, useDirectByteBuffers);
accumulator.append(buffer);

ByteBuffer byteBuffer = buffer.getByteBuffer();
BufferUtil.clearToFill(byteBuffer);
byteBuffer.position(maxHeaderLength);
Expand All @@ -70,7 +74,6 @@ private int generateHeadersFrame(ByteBufferPool.Accumulator accumulator, long st
VarLenInt.encode(byteBuffer, FrameType.HEADERS.type());
VarLenInt.encode(byteBuffer, dataLength);
byteBuffer.position(position);
accumulator.append(buffer);
return headerLength + dataLength;
}
catch (QpackException x)
Expand Down