diff options
| author | 2022-03-25 13:06:56 +0000 | |
|---|---|---|
| committer | 2022-03-25 13:06:56 +0000 | |
| commit | 9f080a0345862dc42680985a45e5846e48e8de9d (patch) | |
| tree | 05e443da28dee20700d36d30f9af9d92850f956a | |
| parent | 276862cf94265422e938f7c3ad0befb35b1bc5b2 (diff) | |
| parent | 936c9f03ea4c111e469f286072ae4867b9215b18 (diff) | |
Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35 am: 936c9f03ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385
Change-Id: I22d92503039e830328e6a22a724aeb1286730108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 { |