tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Fix iterator invalidation in erase_if

Browse Source 
vector::erase invalidates iterators. It's not safe for erase_if to cache the end iterator nor increment, then erase.
This commit is contained in:
John Firebaugh
2017-06-28 17:29:20 -07:00
parent 6aecc66fc8
commit 34453eb4e2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mbgl/util/std.hpp
View File

@@ -8,10 +8,10 @@ namespace mbgl {
namespace util {
template <typename Container, typename ForwardIterator, typename Predicate>
void erase_if(Container &container, ForwardIterator it, const ForwardIterator end, Predicate pred) {
while (it != end) {
void erase_if(Container &container, ForwardIterator it, Predicate pred) {
while (it != container.end()) {
if (pred(*it)) {
container.erase(it++);
it = container.erase(it);
} else {
++it;
}
@@ -20,7 +20,7 @@ void erase_if(Container &container, ForwardIterator it, const ForwardIterator en
template <typename Container, typename Predicate>
void erase_if(Container &container, Predicate pred) {
erase_if(container, container.begin(), container.end(), pred);
erase_if(container, container.begin(), pred);
}
} // namespace util