Merge "Fix segmentation fault in aapt2"

2021-05-10 21:14:20 +00:00
parent 043a83520d b88ccf80aa
commit 6e97fa9812
1 changed files with 2 additions and 1 deletions
--- a/tools/aapt2/dump/DumpManifest.cpp
+++ b/tools/aapt2/dump/DumpManifest.cpp
@@ -135,7 +135,8 @@ class ManifestExtractor {
    template <typename Predicate>
    void Filter(Predicate&& func) {
      children_.erase(std::remove_if(children_.begin(), children_.end(),
-                                     [&](const auto& e) { return func(e.get()); }));
+                                     [&](const auto& e) { return func(e.get()); }),
+                      children_.end());
    }

    /** Retrieves the list of children of the element. */