Fix segmentation fault in aapt2

When passing a single iterator to std::vector::eraase, only element at
that iterator is removed. If no elements are filtered, std::remove_if()
returns the end iterator, attempting to erase() the end iterator can
cause segmentation fault. This bug causes signing test to fail.
https://atp.googleplex.com/tests/asit/ota/signing?tabId=test_run

Test: aapt2
PRODUCT/app/CalculatorGooglePrebuilt/CalculatorGooglePrebuilt.apk

Bug: 175789289
Bug: 178554651

Change-Id: I813055238bef2dcbdf76172a00b3f44ae940b759
(cherry picked from commit b88ccf80aa)
This commit is contained in:
Kelvin Zhang
2021-05-10 12:17:14 -04:00
parent b61fb4ee86
commit 3965584d3a

View File

@@ -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. */