diff options
| author | 2022-03-21 09:13:24 +0000 | |
|---|---|---|
| committer | 2022-03-21 09:13:24 +0000 | |
| commit | f811f765de8dddf3634a2ff4d8cecb5e2aace866 (patch) | |
| tree | 8b22fcaba855161ab3e0d1ba65ec2ad5eaf751dc | |
| parent | ec8b28e50df947938e7f4dd6c5cc30f45c5359cf (diff) | |
| parent | 46653a91c30245ca29d41d69174813979a910496 (diff) | |
Merge "Fix security hole in GateKeeperResponse" into tm-dev
| -rw-r--r-- | core/java/android/service/gatekeeper/GateKeeperResponse.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/service/gatekeeper/GateKeeperResponse.java b/core/java/android/service/gatekeeper/GateKeeperResponse.java index 7ed733cb4f4c..9d648a6995fb 100644 --- a/core/java/android/service/gatekeeper/GateKeeperResponse.java +++ b/core/java/android/service/gatekeeper/GateKeeperResponse.java @@ -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 { |