commit c90f42c80fc9472ad1b46402672c0444b0365f49
author Jackal Guo <jackalguo@google.com> Wed Oct 06 15:50:33 2021 +0800
committer Jackal Guo <jackalguo@google.com> Thu Oct 07 12:56:27 2021 +0800
tree 137db5fae90a134408ccd565620151d8b22350a8
parent a2871f84e911eae02864e1b998f8bc6d344f37d5

Escape single quotes in aapt2

Using #normalizeForOutput to normalize a string for output in order
to escape some special char.

Fix: 140373430
Test: atest libaapt_tests aapt2_tests
Change-Id: Ic49dbaaccd8e4b1c51a87de9f0e2e5f4a8da7d3d

tools/aapt2/xml/XmlDom.cpp

diff --git a/tools/aapt2/xml/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp
index 8b7eadf9..dd60f17 100644
--- a/tools/aapt2/xml/XmlDom.cpp
+++ b/tools/aapt2/xml/XmlDom.cpp
@@ -349,7 +349,8 @@
         size_t len;
         const char16_t* str16 = tree.getText(&len);
         if (str16) {
-          text->text = util::Utf16ToUtf8(StringPiece16(str16, len));
+          text->text =
+              ResTable::normalizeForOutput(util::Utf16ToUtf8(StringPiece16(str16, len)).c_str());
         }
         CHECK(!node_stack.empty());
         node_stack.top()->AppendChild(std::move(text));