Skip to content

Commit 3840abe

Browse files
lundibunditargos
authored andcommitted
http2: small clean up in OnStreamRead
PR-URL: #30351 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 43e947a commit 3840abe

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/node_http2.cc

+4-8
Original file line numberDiff line numberDiff line change
@@ -1867,14 +1867,10 @@ void Http2Session::OnStreamRead(ssize_t nread, const uv_buf_t& buf_) {
18671867
// call in OnStreamAfterWrite() immediately provides data. If that does
18681868
// happen, we concatenate the data we received with the already-stored
18691869
// pending input data, slicing off the already processed part.
1870-
AllocatedBuffer new_buf = env()->AllocateManaged(
1871-
stream_buf_.len - stream_buf_offset_ + nread);
1872-
memcpy(new_buf.data(),
1873-
stream_buf_.base + stream_buf_offset_,
1874-
stream_buf_.len - stream_buf_offset_);
1875-
memcpy(new_buf.data() + stream_buf_.len - stream_buf_offset_,
1876-
buf.data(),
1877-
nread);
1870+
size_t pending_len = stream_buf_.len - stream_buf_offset_;
1871+
AllocatedBuffer new_buf = env()->AllocateManaged(pending_len + nread);
1872+
memcpy(new_buf.data(), stream_buf_.base + stream_buf_offset_, pending_len);
1873+
memcpy(new_buf.data() + pending_len, buf.data(), nread);
18781874
buf = std::move(new_buf);
18791875
nread = buf.size();
18801876
stream_buf_offset_ = 0;

0 commit comments

Comments
 (0)