Skip to content
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

Jump to bottom

http2: fix memory leak when headers are not emitted #21373

Closed
wants to merge 1 commit into from
Closed

http2: fix memory leak when headers are not emitted #21373

Show file tree
Hide file tree
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
13 changes: 8 additions & 5 deletions src/node_http2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,8 +1127,7 @@ void Http2Session::HandleHeadersFrame(const nghttp2_frame* frame) {
if (stream->IsDestroyed())
return;

nghttp2_header* headers = stream->headers();
size_t count = stream->headers_count();
std::vector<nghttp2_header> headers(stream->move_headers());

Local<String> name_str;
Local<String> value_str;
Expand All @@ -1145,9 +1144,9 @@ void Http2Session::HandleHeadersFrame(const nghttp2_frame* frame) {
// this way for performance reasons (it's faster to generate and pass an
// array than it is to generate and pass the object).
size_t n = 0;
while (count > 0) {
while (n < headers.size()) {
size_t j = 0;
while (count > 0 && j < arraysize(argv) / 2) {
while (n < headers.size() && j < arraysize(argv) / 2) {
nghttp2_header item = headers[n++];
// The header name and value are passed as external one-byte strings
name_str =
Expand All @@ -1156,7 +1155,6 @@ void Http2Session::HandleHeadersFrame(const nghttp2_frame* frame) {
ExternalHeader::New<false>(env(), item.value).ToLocalChecked();
argv[j * 2] = name_str;
argv[j * 2 + 1] = value_str;
count--;
j++;
}
// For performance, we pass name and value pairs to array.protototype.push
Expand Down Expand Up @@ -1710,6 +1708,11 @@ Http2Stream::Http2Stream(


Http2Stream::~Http2Stream() {
for (nghttp2_header& header : current_headers_) {
nghttp2_rcbuf_decref(header.name);
nghttp2_rcbuf_decref(header.value);
}

if (session_ == nullptr)
return;
Debug(this, "tearing down stream");
Expand Down
8 changes: 2 additions & 6 deletions src/node_http2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,18 +592,14 @@ class Http2Stream : public AsyncWrap,

bool AddHeader(nghttp2_rcbuf* name, nghttp2_rcbuf* value, uint8_t flags);

inline nghttp2_header* headers() {
return current_headers_.data();
inline std::vector<nghttp2_header> move_headers() {
return std::move(current_headers_);
}

inline nghttp2_headers_category headers_category() const {
return current_headers_category_;
}

inline size_t headers_count() const {
return current_headers_.size();
}

void StartHeaders(nghttp2_headers_category category);

// Required for StreamBase
Expand Down