smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix a few bad iterator accesses.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8231 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-09 21:35:33 +00:00
parent 74385f9642
commit ad916f6241
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
libs/evoral/src/Sequence.cpp
View file

@ -580,6 +580,7 @@ Sequence<Time>::end_write (bool delete_stuck)
for (typename Notes::iterator n = _notes.begin(); n != _notes.end() ;) { for (typename Notes::iterator n = _notes.begin(); n != _notes.end() ;) {
typename Notes::iterator next = n; typename Notes::iterator next = n;
++next; ++next;
if ((*n)->length() == 0) { if ((*n)->length() == 0) {
cerr << "WARNING: Stuck note lost: " << (*n)->note() << endl; cerr << "WARNING: Stuck note lost: " << (*n)->note() << endl;
_notes.erase(n); _notes.erase(n);
@ -642,15 +643,20 @@ Sequence<Time>::remove_note_unlocked(const constNotePtr note)
DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 remove note %2 @ %3\n", this, (int)note->note(), note->time())); DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 remove note %2 @ %3\n", this, (int)note->note(), note->time()));
for (typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time()); typename Sequence<Time>::Notes::iterator i = note_lower_bound(note->time());
i != _notes.end() && (*i)->time() == note->time(); ++i) { while (i != _notes.end() && (*i)->time() == note->time()) {
typename Sequence<Time>::Notes::iterator tmp = i;
++tmp;
if (*i == note) { if (*i == note) {
NotePtr n = *i;
DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing note %2 @ %3\n", this, (int)(*i)->note(), (*i)->time())); DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing note %2 @ %3\n", this, (int)(*i)->note(), (*i)->time()));
_notes.erase (i); _notes.erase (i);
if ((*i)->note() == _lowest_note || (*i)->note() == _highest_note) { if (n->note() == _lowest_note || n->note() == _highest_note) {
_lowest_note = 127; _lowest_note = 127;
_highest_note = 0; _highest_note = 0;
@ -665,18 +671,25 @@ Sequence<Time>::remove_note_unlocked(const constNotePtr note)
erased = true; erased = true;
} }
i = tmp;
} }
Pitches& p (pitches (note->channel())); Pitches& p (pitches (note->channel()));
NotePtr search_note(new Note<Time>(0, 0, 0, note->note(), 0)); NotePtr search_note(new Note<Time>(0, 0, 0, note->note(), 0));
for (typename Pitches::iterator i = p.lower_bound (search_note); typename Pitches::iterator j = p.lower_bound (search_note);
i != p.end() && (*i)->note() == note->note(); ++i) { while (j != p.end() && (*j)->note() == note->note()) {
if (*i == note) { typename Pitches::iterator tmp = j;
++tmp;
if (*j == note) {
DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing pitch %2 @ %3\n", this, (int)(*i)->note(), (*i)->time())); DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1\terasing pitch %2 @ %3\n", this, (int)(*i)->note(), (*i)->time()));
p.erase (i); p.erase (j);
} }
j = tmp;
} }
if (!erased) { if (!erased) {
@ -806,7 +819,11 @@ Sequence<Time>::append_note_off_unlocked (NotePtr note)
/* XXX use _overlap_pitch_resolution to determine FIFO/LIFO ... */ /* XXX use _overlap_pitch_resolution to determine FIFO/LIFO ... */
for (typename WriteNotes::iterator n = _write_notes[note->channel()].begin(); n != _write_notes[note->channel()].end(); ++n) { for (typename WriteNotes::iterator n = _write_notes[note->channel()].begin(); n != _write_notes[note->channel()].end(); ) {
typename WriteNotes::iterator tmp = n;
++tmp;
NotePtr nn = *n; NotePtr nn = *n;
if (note->note() == nn->note() && nn->channel() == note->channel()) { if (note->note() == nn->note() && nn->channel() == note->channel()) {
assert(note->time() >= nn->time()); assert(note->time() >= nn->time());
@ -819,6 +836,8 @@ Sequence<Time>::append_note_off_unlocked (NotePtr note)
resolved = true; resolved = true;
break; break;
} }
n = tmp;
} }
if (!resolved) { if (!resolved) {