Skip to content

Fix linereader wrapping #132

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
resetius merged 1 commit into from
Apr 25, 2026
Merged

Fix linereader wrapping #132

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
4 changes: 2 additions & 2 deletions coroio/sockutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TLine TLineSplitter::Pop() {
Size -= end.size() + p2 + 1;
return TLine { end, begin.substr(0, p2 + 1) };
} else {
RPos += p1 + 1;
RPos = (RPos + p1 + 1) % Cap;
Size -= p1 + 1;
return TLine { end.substr(0, p1 + 1), {} };
}
Expand Down Expand Up @@ -70,7 +70,7 @@ TLine TZeroCopyLineSplitter::Pop() {
Size -= end.size() + p2 + 1;
return TLine { end, begin.substr(0, p2 + 1) };
} else {
RPos += p1 + 1;
RPos = (RPos + p1 + 1) % Cap;
Size -= p1 + 1;
return TLine { end.substr(0, p1 + 1), {} };
}
Expand Down
30 changes: 30 additions & 0 deletions tests/tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,34 @@ void test_zero_copy_line_splitter(void**) {
}
}

void test_line_splitter_wrap(void**) {
TLineSplitter splitter(4); // Cap=8
splitter.Push("aaa\n", 4);
splitter.Pop();
splitter.Push("bbb\n", 4);
splitter.Pop(); // RPos hits Cap without fix

splitter.Push("cc\n", 3);
auto l = splitter.Pop();
assert_true(static_cast<bool>(l));
std::string result = std::string(l.Part1) + std::string(l.Part2);
assert_string_equal("cc\n", result.data());
}

void test_zero_copy_line_splitter_wrap(void**) {
TZeroCopyLineSplitter splitter(4); // Cap=8
splitter.Push("aaa\n", 4);
splitter.Pop();
splitter.Push("bbb\n", 4);
splitter.Pop(); // RPos hits Cap without fix

splitter.Push("cc\n", 3);
auto l = splitter.Pop();
assert_true(static_cast<bool>(l));
std::string result = std::string(l.Part1) + std::string(l.Part2);
assert_string_equal("cc\n", result.data());
}

void test_self_id(void**) {
void* id;
TFuture<void> h = [](void** id) -> TFuture<void> {
Expand Down Expand Up @@ -1308,6 +1336,8 @@ int main(int argc, char* argv[]) {
ADD_TEST(cmocka_unit_test, test_timespec);
ADD_TEST(cmocka_unit_test, test_line_splitter);
ADD_TEST(cmocka_unit_test, test_zero_copy_line_splitter);
ADD_TEST(cmocka_unit_test, test_line_splitter_wrap);
ADD_TEST(cmocka_unit_test, test_zero_copy_line_splitter_wrap);
ADD_TEST(cmocka_unit_test, test_self_id);
ADD_TEST(cmocka_unit_test, test_resolv_nameservers);
ADD_TEST(my_unit_poller, test_listen);
Expand Down
Loading