commit 8f7b8a1f6c5808ea205bfb3294a313e2bcaedf7f
author Sergio Giro <sgiro@google.com> Thu Jul 21 14:44:07 2016 +0100
committer Martijn Coenen <maco@google.com> Thu Aug 25 12:04:40 2016 +0200
tree 9ed3dfd1f059e1b87dc169a27159224eeda82c55
parent e71ecb2c4df15f727f51a0e1b65459f071853e35

Unicode: specify destination length in utf8_to_utf16 methods

Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3

tools/aapt2/util/Util.cpp

diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp
index 7b0c71d..7ee6e77 100644
--- a/tools/aapt2/util/Util.cpp
+++ b/tools/aapt2/util/Util.cpp
@@ -430,7 +430,11 @@
 
     std::u16string utf16;
     utf16.resize(utf16Length);
-    utf8_to_utf16(reinterpret_cast<const uint8_t*>(utf8.data()), utf8.length(), &*utf16.begin());
+    utf8_to_utf16(
+            reinterpret_cast<const uint8_t*>(utf8.data()),
+            utf8.length(),
+            &*utf16.begin(),
+            (size_t) utf16Length + 1);
     return utf16;
 }