commit a15c2a8957b9883cb293fdacaeabd7f2e037a0a5
author Ryan Mitchell <rtmitchell@google.com> Mon Mar 26 11:05:31 2018 -0700
committer Ryan Mitchell <rtmitchell@google.com> Thu Mar 29 15:42:13 2018 -0700
tree 0a133e8bfeb6a4d2f55be12a76a427e01f1cd7c9
parent 3730b6bab6db741170471c2bd2755e3b31293a93

Check the size of the strings in the StringPool before flattening.

Test: Tested for normal functionality when string does not exceed
maximum length and tests for detection of string that is too lonhg for
UTF8i
Bug: b/74176037

Change-Id: Ic71d3671a069e7012e8ca107e79e071499eebbf6

tools/aapt2/cmd/Convert.cpp

diff --git a/tools/aapt2/cmd/Convert.cpp b/tools/aapt2/cmd/Convert.cpp
index 56bf487..3c8beaa 100644
--- a/tools/aapt2/cmd/Convert.cpp
+++ b/tools/aapt2/cmd/Convert.cpp
@@ -226,7 +226,7 @@
 
   bool SerializeTable(ResourceTable* table, IArchiveWriter* writer) override {
     pb::ResourceTable pb_table;
-    SerializeTableToPb(*table, &pb_table);
+    SerializeTableToPb(*table, &pb_table, context_->GetDiagnostics());
     return io::CopyProtoToArchive(context_, &pb_table, kProtoResourceTablePath,
                                   ArchiveEntry::kCompress, writer);
   }