Skip to content

buffer: draining any zero byte fragments (#9837) (#109) #172

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
istio-testing merged 1 commit into from
Mar 3, 2020
Merged

buffer: draining any zero byte fragments (#9837) (#109) #172

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: 5 additions & 0 deletions source/common/buffer/buffer_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ void OwnedImpl::drain(uint64_t size) {
size = 0;
}
}
// Make sure to drain any zero byte fragments that might have been added as
// sentinels for flushed data.
while (!slices_.empty() && slices_.front()->dataSize() == 0) {
slices_.pop_front();
}
}

uint64_t OwnedImpl::getRawSlices(RawSlice* out, uint64_t out_size) const {
Expand Down
18 changes: 18 additions & 0 deletions test/common/buffer/owned_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,24 @@ TEST_F(OwnedImplTest, AddBufferFragmentWithCleanup) {
EXPECT_TRUE(release_callback_called_);
}

TEST_F(OwnedImplTest, AddEmptyFragment) {
char input[] = "hello world";
BufferFragmentImpl frag1(input, 11, [](const void*, size_t, const BufferFragmentImpl*) {});
BufferFragmentImpl frag2("", 0, [this](const void*, size_t, const BufferFragmentImpl*) {
release_callback_called_ = true;
});
Buffer::OwnedImpl buffer;
buffer.addBufferFragment(frag1);
EXPECT_EQ(11, buffer.length());

buffer.addBufferFragment(frag2);
EXPECT_EQ(11, buffer.length());

buffer.drain(11);
EXPECT_EQ(0, buffer.length());
EXPECT_TRUE(release_callback_called_);
}

TEST_F(OwnedImplTest, AddBufferFragmentDynamicAllocation) {
char input_stack[] = "hello world";
char* input = new char[11];
Expand Down