Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a534058

Browse filesBrowse files
lundibunditargos
authored andcommitted
http2: small clean up in OnStreamRead
PR-URL: #30351 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent d68807b commit a534058
Copy full SHA for a534058

File tree

Expand file treeCollapse file tree

1 file changed

+4
-8
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-8
lines changed
Open diff view settings
Collapse file

‎src/node_http2.cc‎

Copy file name to clipboardExpand all lines: src/node_http2.cc
+4-8Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,14 +1907,10 @@ void Http2Session::OnStreamRead(ssize_t nread, const uv_buf_t& buf_) {
19071907
// call in OnStreamAfterWrite() immediately provides data. If that does
19081908
// happen, we concatenate the data we received with the already-stored
19091909
// pending input data, slicing off the already processed part.
1910-
AllocatedBuffer new_buf = env()->AllocateManaged(
1911-
stream_buf_.len - stream_buf_offset_ + nread);
1912-
memcpy(new_buf.data(),
1913-
stream_buf_.base + stream_buf_offset_,
1914-
stream_buf_.len - stream_buf_offset_);
1915-
memcpy(new_buf.data() + stream_buf_.len - stream_buf_offset_,
1916-
buf.data(),
1917-
nread);
1910+
size_t pending_len = stream_buf_.len - stream_buf_offset_;
1911+
AllocatedBuffer new_buf = env()->AllocateManaged(pending_len + nread);
1912+
memcpy(new_buf.data(), stream_buf_.base + stream_buf_offset_, pending_len);
1913+
memcpy(new_buf.data() + pending_len, buf.data(), nread);
19181914
buf = std::move(new_buf);
19191915
nread = buf.size();
19201916
stream_buf_offset_ = 0;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.