diff options
author | Steven Moreland <smoreland@google.com> | 2020-12-04 21:13:03 +0000 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2020-12-07 18:05:49 +0000 |
commit | 61d0f84881cfc1bbac513ccd156c56603a48cc90 (patch) | |
tree | bd28b56bf1a52fbd2eee0b2f828a97a50b3d7d6c | |
parent | 58f5cfa56d5282e69a7580dc4bb97603c409f003 (diff) | |
download | native-61d0f84881cfc1bbac513ccd156c56603a48cc90.tar.gz |
libbinder: readString*Inplace SafetyNet (II)
SafetyNet logs (this time for failure case, instead of success case).
Bug: 172655291
Test: adb logcat -b events | grep snet # exactly one occurance w/ repro
(c/p'd from 34af0637666f43ae62040ad1bad76468423feba2)
Merged-In: I75ace071693c0a4579ed9477f7b9212a6e27c36d
Change-Id: I75ace071693c0a4579ed9477f7b9212a6e27c36d
-rw-r--r-- | libs/binder/Parcel.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 1f7d27e0e9..b7ad660317 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1869,8 +1869,11 @@ const char* Parcel::readString8Inplace(size_t* outLen) const 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 @@ const char16_t* Parcel::readString16Inplace(size_t* outLen) const 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; |