Add bound checks to utf16_to_utf8

Sergio Giro · gitbuildkicker · commit f0ea4c8737ec · 2016-07-21T17:34:52.000-07:00
Test: ran libaapt2_tests64 Bug: 29250543 Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3 (cherry picked from commit 4781057)
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
@@ -63,8 +63,8 @@ aaptHostLdLibs :=
 aaptHostStaticLibs := \
     libandroidfw \
     libpng \
-    liblog \
     libutils \
+    liblog \
     libcutils \
     libexpat \
     libziparchive-host \
diff --git a/tools/aapt2/Util.cpp b/tools/aapt2/Util.cpp
@@ -303,8 +303,10 @@ std::string utf16ToUtf8(const StringPiece16& utf16) {
     }
 
     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;
 }
 
diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk
@@ -48,8 +48,8 @@ hostStaticLibs := \
     libaapt \
     libandroidfw \
     libpng \
-    liblog \
     libutils \
+    liblog \
     libcutils \
     libexpat \
     libziparchive-host \

Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,10 @@ std::string utf16ToUtf8(const StringPiece16& utf16) {`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`std::string utf8;`
	`306`	`+ // Make room for '\0' explicitly.`
	`307`	`+ utf8.resize(utf8Length + 1);`
	`308`	`+ utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin(), utf8Length + 1);`
`306`	`309`	`utf8.resize(utf8Length);`
`307`		`- utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin());`
`308`	`310`	`return utf8;`
`309`	`311`	`}`
`310`	`312`