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

Commit a1da2773 authored by felkachang's avatar felkachang Committed by Felka Chang
Browse files

Fix aapt2 dump xmltree not escape text nodes 

The text of CDATA in XML document should be escaped before the CDATA
text is printed.

Dump xmltree command use XmlPrinter inheriting from xml:ConstVisitor.
To fix issue, it only needs to modify
XmlPrinter::Visit(const xml::Text).

Bug: 140373430
Test: aapt2 dump xmltree --file res/xml/test.xml app_debug.apk

Change-Id: I4f43120b4fbc2ea7136fb51fdeb24e254b94c60f
parent 77689d19

tools/aapt2/Debug.cpp

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "ValueVisitor.h"

#include "android-base/logging.h"

#include "android-base/stringprintf.h"

#include "androidfw/ResourceTypes.h"

#include "idmap2/Policies.h"

#include "text/Printer.h"

#include "util/Util.h"
@@ -515,7 +516,8 @@ class XmlPrinter : public xml::ConstVisitor { 
  }



  void Visit(const xml::Text* text) override {

    printer_->Println(StringPrintf("T: '%s'", text->text.c_str()));

    printer_->Println(

        StringPrintf("T: '%s'", android::ResTable::normalizeForOutput(text->text.c_str()).c_str()));

  }



 private: