From a2b4fcde92b6c841c6fd6532016608a6bec05a30 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 3 May 2021 15:37:00 -0700 Subject: [PATCH] Fix uninitialized macro reference member Reference::allow_raw was left uninitialized. Bug: 175616308 Test: aapt2_tests Change-Id: I58a560c7fb278c1aa2b415e456f849999c835155 --- tools/aapt2/ResourceValues.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/aapt2/ResourceValues.h b/tools/aapt2/ResourceValues.h index d11b013f14d5c..d903b7e1b8b39 100644 --- a/tools/aapt2/ResourceValues.h +++ b/tools/aapt2/ResourceValues.h @@ -154,18 +154,18 @@ struct BaseItem : public Item { // A reference can be symbolic (with the name set to a valid resource name) or be // numeric (the id is set to a valid resource ID). struct Reference : public TransformableItem> { - enum class Type { + enum class Type : uint8_t { kResource, kAttribute, }; Maybe name; Maybe id; + std::optional type_flags; Reference::Type reference_type; bool private_reference = false; bool is_dynamic = false; - std::optional type_flags; - bool allow_raw; + bool allow_raw = false; Reference(); explicit Reference(const ResourceNameRef& n, Type type = Type::kResource);