diff options
| author | 2016-07-11 12:11:30 +0000 | |
|---|---|---|
| committer | 2016-07-11 12:11:31 +0000 | |
| commit | 49c410bc48c47b636c239e6e3c590f77f1b7fd23 (patch) | |
| tree | aad1f9f0d3f21916db6eb609423bef73939ab7ba | |
| parent | acdd639513858629f804316e9dd4105634504a90 (diff) | |
| parent | 4781057e78f63e0e99af109cebf3b6a78f4bfbb6 (diff) | |
Merge "Add bound checks to utf16_to_utf8" into nyc-mr1-dev
| -rw-r--r-- | tools/aapt/Android.mk | 2 | ||||
| -rw-r--r-- | tools/aapt2/util/Util.cpp | 4 | ||||
| -rw-r--r-- | tools/split-select/Android.mk | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index b7014454771c..2a490d1097ef 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -57,8 +57,8 @@ aaptTests := \ aaptHostStaticLibs := \ libandroidfw \ libpng \ - liblog \ libutils \ + liblog \ libcutils \ libexpat \ libziparchive-host \ diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp index 7b0c71d93bb5..5a87c334c59e 100644 --- a/tools/aapt2/util/Util.cpp +++ b/tools/aapt2/util/Util.cpp @@ -441,8 +441,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 index 239bed589412..863abae1e0fb 100644 --- a/tools/split-select/Android.mk +++ b/tools/split-select/Android.mk @@ -47,8 +47,8 @@ hostStaticLibs := \ libaapt \ libandroidfw \ libpng \ - liblog \ libutils \ + liblog \ libcutils \ libexpat \ libziparchive-host \ |