Skip to content

[piper] do not index past the end for an empty demuxed body #1765

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
akashchamp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[piper] do not index past the end for an empty demuxed body #1765

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 src/log_format_impls.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ class piper_log_format : public log_format {
const auto prefix_len = this->plf_cached_line.size();
this->plf_cached_line.resize(this->plf_cached_line.size()
+ sbr.length());
memcpy(
&this->plf_cached_line[prefix_len], sbr.get_data(), sbr.length());
memcpy(this->plf_cached_line.data() + prefix_len,
sbr.get_data(),
sbr.length());

sbr.share(this->plf_share_manager,
this->plf_cached_line.data(),
Expand Down
1 change: 1 addition & 0 deletions test/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ dist_noinst_DATA = \
logfile_cloudflare.1 \
logfile_cxx.0 \
logfile_docker_compose.0 \
logfile_docker_compose_empty_body.0 \
logfile_docker_compose_with_noise.0 \
logfile_docker_compose_with_ts.0 \
logfile_dst.0 \
Expand Down
Empty file added test/expected/test_demux.sh_83e339125bf0af442ee46a6f498cb750cda01d5f.err
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions test/expected/test_demux.sh_83e339125bf0af442ee46a6f498cb750cda01d5f.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
2013-06-06T19:13:20.123456+0000
2013-06-06T19:13:20.123456+0000 hello
2 changes: 2 additions & 0 deletions test/logfile_docker_compose_empty_body.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
db-1 |
db-1 | hello
3 changes: 3 additions & 0 deletions test/test_demux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ cat ${test_dir}/logfile_docker_compose_with_ts.0 | run_cap_test env TEST_COMMENT

run_cap_test ${lnav_test} -n ${test_dir}/logfile_docker_compose_with_ts.0

# The first message has an empty body
run_cap_test ${lnav_test} -n ${test_dir}/logfile_docker_compose_empty_body.0

run_cap_test ${lnav_test} -n ${test_dir}/logfile_mux_zookeeper.0

run_cap_test ${lnav_test} -n \
Expand Down