Skip to content

Ensure http content copied for safe buffers #112767

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
Tim-Brooks merged 1 commit into from
Sep 11, 2024
Merged

Ensure http content copied for safe buffers #112767

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
8 changes: 7 additions & 1 deletion modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ public HttpRequest releaseAndCopy() {
}
try {
final ByteBuf copiedContent = Unpooled.copiedBuffer(request.content());
HttpBody newContent;
if (content.isStream()) {
newContent = content;
} else {
newContent = Netty4Utils.fullHttpBodyFrom(copiedContent);
}
return new Netty4HttpRequest(
sequence,
new DefaultFullHttpRequest(
Expand All @@ -139,7 +145,7 @@ public HttpRequest releaseAndCopy() {
),
new AtomicBoolean(false),
false,
content
newContent
);
} finally {
release();
Expand Down