commit 0c14ecd396d06b8ee1d6d1befbfba67d084e4fda
author Steven Moreland <smoreland@google.com> Wed Dec 09 00:08:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 09 00:08:27 2020 +0000
tree bd28b56bf1a52fbd2eee0b2f828a97a50b3d7d6c
parent abe42c95f650e8bf9dbb034263a8fcee9c0aaf46
parent 61d0f84881cfc1bbac513ccd156c56603a48cc90

libbinder: readString*Inplace SafetyNet (II) am: 61d0f84881

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13170519

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2945a9d2f2acc742ce7817b309948cafdd0d377

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 1f7d27e..b7ad660 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1869,8 +1869,11 @@
     if (size >= 0 && size < INT32_MAX) {
         *outLen = size;
         const char* str = (const char*)readInplace(size+1);
-        if (str != nullptr && str[size] == '\0') {
-            return str;
+        if (str != nullptr) {
+            if (str[size] == '\0') {
+                return str;
+            }
+            android_errorWriteLog(0x534e4554, "172655291");
         }
     }
     *outLen = 0;
@@ -1929,8 +1932,11 @@
     if (size >= 0 && size < INT32_MAX) {
         *outLen = size;
         const char16_t* str = (const char16_t*)readInplace((size+1)*sizeof(char16_t));
-        if (str != nullptr && str[size] == u'\0') {
-            return str;
+        if (str != nullptr) {
+            if (str[size] == u'\0') {
+                return str;
+            }
+            android_errorWriteLog(0x534e4554, "172655291");
         }
     }
     *outLen = 0;