commit f0ea4c8737ec911074cc4d284f984c5c353f32e2
author Sergio Giro <sgiro@google.com> Tue Jun 28 18:26:10 2016 +0100
committer gitbuildkicker <android-build@google.com> Thu Jul 21 17:34:52 2016 -0700
tree 0f19f2d541dca7380ba3a90057ecc4f6c952f59e
parent 28460c294ebd9c9cab258c92a20e0e2cc63e64f0

Add bound checks to utf16_to_utf8

Test: ran libaapt2_tests64
Bug: 29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)

tools/aapt/Android.mk

diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index b991d55..08cbd5a 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -63,8 +63,8 @@
 aaptHostStaticLibs := \
     libandroidfw \
     libpng \
-    liblog \
     libutils \
+    liblog \
     libcutils \
     libexpat \
     libziparchive-host \

tools/aapt2/Util.cpp

diff --git a/tools/aapt2/Util.cpp b/tools/aapt2/Util.cpp
index 03ecd1ac..5b064e3 100644
--- a/tools/aapt2/Util.cpp
+++ b/tools/aapt2/Util.cpp
@@ -303,8 +303,10 @@
     }
 
     std::string utf8;
+    // Make room for '\0' explicitly.
+    utf8.resize(utf8Length + 1);
+    utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin(), utf8Length + 1);
     utf8.resize(utf8Length);
-    utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin());
     return utf8;
 }
 

tools/split-select/Android.mk

diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk
index d9ddf08..54f0a1f 100644
--- a/tools/split-select/Android.mk
+++ b/tools/split-select/Android.mk
@@ -48,8 +48,8 @@
     libaapt \
     libandroidfw \
     libpng \
-    liblog \
     libutils \
+    liblog \
     libcutils \
     libexpat \
     libziparchive-host \