Unverified Commit 75f7787e authored Dec 04, 2020 by Steven Moreland Committed by Kevin F. Haggerty Mar 04, 2021

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 34af0637)
Merged-In: I75ace071693c0a4579ed9477f7b9212a6e27c36d
Change-Id: I75ace071693c0a4579ed9477f7b9212a6e27c36d

Change-Id: I95ef79bac588ed19496b4d6c53e3ae1e4dcce085

parent a036cace

libs/binder/Parcel.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -2192,9 +2192,12 @@ 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') {
		if (str != nullptr) {
		if (str[size] == u'\0') {
		return str;
		}
		android_errorWriteLog(0x534e4554, "172655291");
		}
		}
		*outLen = 0;
		return nullptr;