diff options
| author | 2020-11-14 03:22:09 +0000 | |
|---|---|---|
| committer | 2020-11-14 03:22:09 +0000 | |
| commit | 18a3a6644df14e1b87aa231ceed779ed32c2c229 (patch) | |
| tree | 4ee79bdbcb837322b48f73c27868d26aef50d303 /tools/aapt2/ResourceUtils.cpp | |
| parent | f766eaccaaadfb1db12ac685367c20ffff8fa63e (diff) | |
| parent | 55ef6167a2c235bd88c7216238b2001b46795b79 (diff) | |
Merge changes from topic "revert-12787270-FYIHXORGZY"
* changes:
Revert "libandroidfw hardening for IncFs"
Revert "Cache resolved theme values"
Revert "Do not cache bag parent stack until requested"
Diffstat (limited to 'tools/aapt2/ResourceUtils.cpp')
| -rw-r--r-- | tools/aapt2/ResourceUtils.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp index 5b43df6f0935..7dfc983b54ba 100644 --- a/tools/aapt2/ResourceUtils.cpp +++ b/tools/aapt2/ResourceUtils.cpp @@ -751,12 +751,10 @@ std::unique_ptr<Item> ParseBinaryResValue(const ResourceType& type, const Config switch (res_value.dataType) { case android::Res_value::TYPE_STRING: { const std::string str = util::GetString(src_pool, data); - auto spans_result = src_pool.styleAt(data); + const android::ResStringPool_span* spans = src_pool.styleAt(data); // Check if the string has a valid style associated with it. - if (spans_result.has_value() && - (*spans_result)->name.index != android::ResStringPool_span::END) { - const android::ResStringPool_span* spans = spans_result->unsafe_ptr(); + if (spans != nullptr && spans->name.index != android::ResStringPool_span::END) { StyleString style_str = {str}; while (spans->name.index != android::ResStringPool_span::END) { style_str.spans.push_back(Span{util::GetString(src_pool, spans->name.index), |