Skip to content

buffer: allow to write zero bytes #137

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
merged 1 commit into from
Aug 12, 2025
Merged

buffer: allow to write zero bytes #137

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
14 changes: 10 additions & 4 deletions src/Buffer/Buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,8 @@ template <size_t N, class allocator>
void
Buffer<N, allocator>::write(WData data)
{
assert(data.size != 0);
if (data.size == 0)
return;

char *new_end = m_end + data.size;
if (TNT_LIKELY(isSameBlock(m_end, new_end))) {
Expand Down Expand Up @@ -1105,7 +1106,9 @@ template <bool LIGHT>
void
Buffer<N, allocator>::iterator_common<LIGHT>::set(WData data)
{
assert(data.size > 0);
if (data.size == 0)
return;

char *pos = m_position;
size_t left_in_block = N - (uintptr_t) pos % N;
while (TNT_UNLIKELY(data.size > left_in_block)) {
Expand Down Expand Up @@ -1160,7 +1163,9 @@ template <bool LIGHT>
void
Buffer<N, allocator>::iterator_common<LIGHT>::write(WData data)
{
assert(data.size > 0);
if (data.size == 0)
return;

size_t left_in_block = N - (uintptr_t) m_position % N;
while (TNT_UNLIKELY(data.size >= left_in_block)) {
std::memcpy(m_position, data.data, left_in_block);
Expand Down Expand Up @@ -1216,7 +1221,8 @@ template <bool LIGHT>
void
Buffer<N, allocator>::iterator_common<LIGHT>::get(RData data)
{
assert(data.size > 0);
if (data.size == 0)
return;
/*
* The same implementation as in ::set() method buf vice versa:
* buffer and data sources are swapped.
Expand Down
20 changes: 20 additions & 0 deletions test/BufferUnitTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@ buffer_basic()
TEST_INIT(1, N);
tnt::Buffer<N> buf;
fail_unless(buf.empty());

/* Empty write should work and don't write anything. */
buf.write(typename tnt::Buffer<N>::WData {nullptr, 0});
fail_unless(buf.empty());
fail_if(buf.debugSelfCheck());

buf.write(int_sample);
fail_unless(! buf.empty());
fail_if(buf.debugSelfCheck());
Expand Down Expand Up @@ -383,6 +389,20 @@ buffer_iterator()
const auto& citr = itr;
typename tnt::Buffer<N>::iterator itr2(itr);

/* Empty writes and reads should work and don't write anything. */
itr.write(typename tnt::Buffer<N>::WData {nullptr, 0});
fail_unless(buf.empty());
fail_if(buf.debugSelfCheck());
itr.set(typename tnt::Buffer<N>::WData {nullptr, 0});
fail_unless(buf.empty());
fail_if(buf.debugSelfCheck());
itr.get(typename tnt::Buffer<N>::RData {nullptr, 0});
fail_unless(buf.empty());
fail_if(buf.debugSelfCheck());
itr.read(typename tnt::Buffer<N>::RData {nullptr, 0});
fail_unless(buf.empty());
fail_if(buf.debugSelfCheck());

auto litr1 = itr.enlight();
{
auto itr_test = litr1;
Expand Down
5 changes: 4 additions & 1 deletion test/EncDecTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ test_basic()
mpp::encode(buf, std::integral_constant<bool, false>{});
mpp::encode(buf, std::integral_constant<bool, true>{});
// Strings.
mpp::encode(buf, "");
mpp::encode(buf, "abc");
const char *bbb = "defg";
mpp::encode(buf, bbb);
Expand Down Expand Up @@ -313,7 +314,9 @@ test_basic()
fail_if(bt != true);

// Strings.
std::string a;
std::string a = "to be overwritten";
fail_unless(mpp::decode(run, a));
fail_if(a != "");
char b_data[10];
size_t b_size = 0;
auto b = tnt::make_ref_vector(b_data, b_size);
Expand Down