Skip to content

Fix oversized reads in EncapsulatedSession::InnerStream::Read. #157

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

Open
neeraj1235476 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix oversized reads in EncapsulatedSession::InnerStream::Read. #157

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
5 changes: 3 additions & 2 deletions quiche/web_transport/encapsulated/encapsulated_web_transport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,9 @@ Stream::ReadResult EncapsulatedSession::InnerStream::Read(
memcpy(output.data(), read.data.data(), size_to_read);
output = output.subspan(size_to_read);
}
bool fin_consumed = SkipBytes(total_size);
return ReadResult{total_size, fin_consumed};
const size_t bytes_read = total_size - output.size();
bool fin_consumed = SkipBytes(bytes_read);
return ReadResult{bytes_read, fin_consumed};
}
Stream::ReadResult EncapsulatedSession::InnerStream::Read(std::string* output) {
const size_t total_size = ReadableBytes();
Expand Down
25 changes: 25 additions & 0 deletions quiche/web_transport/encapsulated/encapsulated_web_transport_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,31 @@ TEST_F(EncapsulatedWebTransportTest, FinRead) {
EXPECT_TRUE(read.fin);
}

TEST_F(EncapsulatedWebTransportTest, ReadIntoOversizedBuffer) {
std::unique_ptr<EncapsulatedSession> session =
CreateTransport(Perspective::kClient);
DefaultHandshakeForClient(*session);
EXPECT_CALL(*visitor_, OnIncomingBidirectionalStreamAvailable());
ProcessIncomingCapsule(
quiche::WebTransportStreamDataCapsule{1, "abcd", false});
Stream* stream = session->AcceptIncomingBidirectionalStream();
ASSERT_TRUE(stream != nullptr);
EXPECT_EQ(stream->ReadableBytes(), 4u);

std::array<char, 16> buffer;
Stream::ReadResult read = stream->Read(absl::MakeSpan(buffer));
EXPECT_EQ(read.bytes_read, 4u);
EXPECT_FALSE(read.fin);
EXPECT_EQ(absl::string_view(buffer.data(), read.bytes_read), "abcd");
EXPECT_EQ(stream->ReadableBytes(), 0u);

ProcessIncomingCapsule(quiche::WebTransportStreamDataCapsule{1, "ef", true});
read = stream->Read(absl::MakeSpan(buffer));
EXPECT_EQ(read.bytes_read, 2u);
EXPECT_TRUE(read.fin);
EXPECT_EQ(absl::string_view(buffer.data(), read.bytes_read), "ef");
}

TEST_F(EncapsulatedWebTransportTest, LargeRead) {
std::unique_ptr<EncapsulatedSession> session =
CreateTransport(Perspective::kClient);
Expand Down
Loading