Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 08:09:32 +02:00
Code Issues Releases Wiki Activity

Fix dangling list iterator bug, detected by MSVC debug library

Browse Source
This commit is contained in:
Paul Licameli 2020-08-23 11:08:05 -04:00
parent d420fdecf4
commit c3403054c3
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Track.cpp
View File

@ -1087,27 +1087,24 @@ void TrackList::ClearPendingTracks( ListOfTracks *pAdded )
// To find the first node that remains after the first deleted one // To find the first node that remains after the first deleted one
TrackNodePointer node; TrackNodePointer node;
bool findingNode = false;
bool foundNode = false; bool foundNode = false;
for (auto it = ListOfTracks::begin(), stop = ListOfTracks::end(); for (auto it = ListOfTracks::begin(), stop = ListOfTracks::end();
it != stop;) { it != stop;) {
if (it->get()->GetId() == TrackId{}) { if (it->get()->GetId() == TrackId{}) {
if (pAdded) do {
pAdded->push_back( *it ); if (pAdded)
(*it)->SetOwner( {}, {} ); pAdded->push_back( *it );
it = erase( it ); (*it)->SetOwner( {}, {} );
it = erase( it );
}
while (it != stop && it->get()->GetId() == TrackId{});
if (!findingNode)
findingNode = true;
if (!foundNode && it != stop) if (!foundNode && it != stop)
node = (*it)->GetNode(); node = (*it)->GetNode(), foundNode = true;
} }
else { else
if ( findingNode )
foundNode = true;
++it; ++it;
}
} }
if (!empty()) { if (!empty()) {