commit fac1d16e966a77af582c5153b91586b42ff30902
author Martijn Coenen <maco@google.com> Thu Aug 25 20:24:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 25 20:24:10 2016 +0000
tree 84c633ac6e3816327eb9437a0b42c85aff3c0994
parent 9a057a99dfbeaaa3160929049debdc5df8731021
parent 654107c72507582cebfa1ceb2c68bbbd61054abf

Merge changes from topic 'utf' am: 213f015932
am: 654107c725

Change-Id: Ic4c07e7d56f8f78190d7f7e57cad2760b30e90ca

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 028d15f..061cb08 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -750,7 +750,7 @@
     const uint8_t* strData = (uint8_t*)str.data();
     const size_t strLen= str.length();
     const ssize_t utf16Len = utf8_to_utf16_length(strData, strLen);
-    if (utf16Len < 0 || utf16Len> std::numeric_limits<int32_t>::max()) {
+    if (utf16Len < 0 || utf16Len > std::numeric_limits<int32_t>::max()) {
         return BAD_VALUE;
     }
 
@@ -765,7 +765,7 @@
         return NO_MEMORY;
     }
 
-    utf8_to_utf16(strData, strLen, (char16_t*)dst);
+    utf8_to_utf16(strData, strLen, (char16_t*)dst, (size_t) utf16Len + 1);
 
     return NO_ERROR;
 }