diff options
| author | 2022-03-25 13:22:18 +0000 | |
|---|---|---|
| committer | 2022-03-25 13:22:18 +0000 | |
| commit | 40a1fd6bbac145edf18cf753afbf58197b13fa7c (patch) | |
| tree | ede99787ec22d3fa62fe015626f6cf64696d9c59 | |
| parent | 9b1a9dc79f48bb85eb511133b814f48458f8d68f (diff) | |
| parent | d06ee6d79d6727a7b9b82d4737d51e7823306d98 (diff) | |
Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925
Change-Id: If3cd2a65495e018a9d9800ba7c9fa52ba49014f0
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 { |