Merge "Fix security hole in GateKeeperResponse" into tm-dev am: f811f765de

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

Change-Id: I5e41dc2c3a52296a76cf9c3c35f94ae04a9de5e7
This commit is contained in:
Ayush Sharma
2022-03-21 09:15:41 +00:00
committed by Automerger Merge Worker

View File

@@ -105,7 +105,7 @@ public final class GateKeeperResponse implements Parcelable {
dest.writeInt(mTimeout);
} else if (mResponseCode == RESPONSE_OK) {
dest.writeInt(mShouldReEnroll ? 1 : 0);
if (mPayload != null) {
if (mPayload != null && mPayload.length > 0) {
dest.writeInt(mPayload.length);
dest.writeByteArray(mPayload);
} else {