Skip to content

Fix null-pointer dereference in SystemUtils::getSurroundingBarlines #559

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

Fix null-pointer dereference in SystemUtils::getSurroundingBarlines #559

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
12 changes: 11 additions & 1 deletion source/score/system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,17 @@ SystemUtils::getSurroundingBarlines(const System &system, int position)
current_bar = system.getPreviousBarline(position);

const Barline *next_bar = system.getNextBarline(position);
assert(next_bar);

// If playback lands exactly on (or past) the system's end barline -- which
// can happen via repeats/directions/alternate endings -- there is no
// strictly-later barline. Fall back to the end barline for both; callers
// treat the empty [current, next) range as no events and advance to the
// next system. Likewise guard current_bar in case position precedes all
// barlines.
if (!next_bar)
next_bar = &system.getBarlines().back();
if (!current_bar)
current_bar = &system.getBarlines().front();

return { *current_bar, *next_bar };
}