FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed iterator invalidation bug picked by Covertiy scan.

Browse Source
This commit is contained in:
Robert Osfield
2016-06-10 12:03:48 +01:00
parent 721e079211
commit 69046511de
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osg/OperationThread.cpp
View File

@@ -143,7 +143,10 @@ void OperationQueue::remove(Operation* operation)
itr = _operations.erase(itr);
if (needToResetCurrentIterator) _currentOperationIterator = itr;
if (needToResetCurrentIterator)
{
_currentOperationIterator = (itr==_operations.end()) ? _operations.begin() : itr;
}
}
else ++itr;
@@ -167,7 +170,10 @@ void OperationQueue::remove(const std::string& name)
itr = _operations.erase(itr);
if (needToResetCurrentIterator) _currentOperationIterator = itr;
if (needToResetCurrentIterator)
{
_currentOperationIterator = (itr==_operations.end()) ? _operations.begin() : itr;
}
}
else ++itr;
}