allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix overflow when computing framewalk_to_beats with -ve pos; fixes #4694.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11982 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2012-04-15 17:43:45 +00:00
parent 1f33d60aff
commit 2c0f704f28
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ardour/tempo.cc
View File

@@ -2177,10 +2177,18 @@ TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const
while (distance) {
/* End of this section */
framepos_t const end = ((next_tempo == metrics.end()) ? max_framepos : (*next_tempo)->frame ());
framepos_t end;
/* Distance to `end' in frames */
framepos_t distance_to_end;
/* Distance to the end in frames */
framecnt_t const distance_to_end = end - pos;
if (next_tempo == metrics.end ()) {
/* We can't do (end - pos) if end is max_framepos, as it will overflow if pos is -ve */
end = max_framepos;
distance_to_end = max_framepos;
} else {
end = (*next_tempo)->frame ();
distance_to_end = end - pos;
}
/* Amount to subtract this time */
double const sub = min (distance, distance_to_end);