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

Commit ea134e08 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

AAPT2: Fix order-of-destruction crash 

Make sure that users of StringPool are destroyed before
the StringPool itself.

Test: valgrind aapt2 optimize -o opt.apk out/target/common/obj/APPS/framework-res_intermediates/package-export.apk
Change-Id: I140c2d32f8449028976795d5d6865d83e1409b53
parent ec8f3536

tools/aapt2/cmd/Link.cpp

+2 −2
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ bool ResourceFileFlattener::LinkAndVersionXmlFile(ResourceTable* table, FileOper 
        versioned_file_desc.config.sdkVersion = (uint16_t)sdk_level;



        FileOperation new_file_op;

        new_file_op.xml_to_flatten =

            util::make_unique<xml::XmlResource>(versioned_file_desc, doc->root->Clone());

        new_file_op.xml_to_flatten = util::make_unique<xml::XmlResource>(

            versioned_file_desc, StringPool{}, doc->root->Clone());

        new_file_op.config = versioned_file_desc.config;

        new_file_op.entry = file_op->entry;

        new_file_op.dst_path =

tools/aapt2/xml/XmlDom.cpp

+3 −2
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ std::unique_ptr<XmlResource> Inflate(std::istream* in, IDiagnostics* diag, const 


  XML_ParserFree(parser);

  if (stack.root) {

    return util::make_unique<XmlResource>(ResourceFile{{}, {}, source}, std::move(stack.root));

    return util::make_unique<XmlResource>(ResourceFile{{}, {}, source}, StringPool{},

                                          std::move(stack.root));

  }

  return {};

}
@@ -357,7 +358,7 @@ std::unique_ptr<XmlResource> Inflate(const void* data, size_t data_len, IDiagnos 
      }

    }

  }

  return util::make_unique<XmlResource>(ResourceFile{}, std::move(root), std::move(string_pool));

  return util::make_unique<XmlResource>(ResourceFile{}, std::move(string_pool), std::move(root));

}



std::unique_ptr<Node> Namespace::Clone() {

tools/aapt2/xml/XmlDom.h

+6 −1
Original line number Diff line number Diff line
@@ -128,8 +128,13 @@ class Text : public BaseNode<Text> { 
class XmlResource {

 public:

  ResourceFile file;

  std::unique_ptr<xml::Node> root;



  // StringPool must come before the xml::Node. Destructors are called in reverse order, and

  // the xml::Node may have StringPool references that need to be destroyed before the StringPool

  // is destroyed.

  StringPool string_pool;



  std::unique_ptr<xml::Node> root;

};



/**