Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c089dd authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Fixed id parsing error" into pi-dev

parents 33b57e84 eaf77e1d

tools/aapt2/ResourceParser.cpp

+6 −3
Original line number Diff line number Diff line
@@ -598,10 +598,13 @@ bool ResourceParser::ParseResource(xml::XmlPullParser* parser, 
      // If no inner element exists, represent a unique identifier

      out_resource->value = util::make_unique<Id>();

    } else {

      // If an inner element exists, the inner element must be a reference to

      // another resource id

      Reference* ref = ValueCast<Reference>(out_resource->value.get());

      if (!ref || ref->name.value().type != ResourceType::kId) {

      if (ref && !ref->name && !ref->id) {

        // A null reference also means there is no inner element when ids are in the form:

        //    <id name="name"/>

        out_resource->value = util::make_unique<Id>();

      } else if (!ref || ref->name.value().type != ResourceType::kId) {

        // If an inner element exists, the inner element must be a reference to another resource id

        diag_->Error(DiagMessage(out_resource->source)

                         << "<" << parser->element_name()

                         << "> inner element must either be a resource reference or empty");

tools/aapt2/ResourceParser_test.cpp

+15 −5
Original line number Diff line number Diff line
@@ -944,20 +944,30 @@ TEST_F(ResourceParserTest, ParseIdItem) { 
  ASSERT_THAT(test::GetValue<Id>(&table_, "id/bar"), NotNull());

  ASSERT_THAT(test::GetValue<Id>(&table_, "id/baz"), NotNull());



  input = R"(

    <id name="foo2">@id/bar</id>

    <id name="bar2"/>

    <id name="baz2"></id>)";

  ASSERT_TRUE(TestParse(input));



  ASSERT_THAT(test::GetValue<Reference>(&table_, "id/foo2"), NotNull());

  ASSERT_THAT(test::GetValue<Id>(&table_, "id/bar2"), NotNull());

  ASSERT_THAT(test::GetValue<Id>(&table_, "id/baz2"), NotNull());



  // Reject attribute references

  input = R"(<item name="foo2" type="id">?attr/bar"</item>)";

  input = R"(<item name="foo3" type="id">?attr/bar"</item>)";

  ASSERT_FALSE(TestParse(input));



  // Reject non-references

  input = R"(<item name="foo3" type="id">0x7f010001</item>)";

  input = R"(<item name="foo4" type="id">0x7f010001</item>)";

  ASSERT_FALSE(TestParse(input));

  input = R"(<item name="foo4" type="id">@drawable/my_image</item>)";

  input = R"(<item name="foo5" type="id">@drawable/my_image</item>)";

  ASSERT_FALSE(TestParse(input));

  input = R"(<item name="foo5" type="id"><string name="biz"></string></item>)";

  input = R"(<item name="foo6" type="id"><string name="biz"></string></item>)";

  ASSERT_FALSE(TestParse(input));



  // Ids that reference other resource ids cannot be public

  input = R"(<public name="foo6" type="id">@id/bar6</item>)";

  input = R"(<public name="foo7" type="id">@id/bar7</item>)";

  ASSERT_FALSE(TestParse(input));

}