diff options
| author | 2022-03-25 12:41:07 +0000 | |
|---|---|---|
| committer | 2022-03-25 12:41:07 +0000 | |
| commit | efb797700e3d26ffe776f49de397f74ed8d39f8d (patch) | |
| tree | 66f94fc664d40aa663a11baa0b0b5b98b9c8d591 | |
| parent | 14dec12d60b4fc734dd5067c01c5e98a12aae85a (diff) | |
| parent | 658c53c47c0d1b6a74d3c0a72372aaaba16c2516 (diff) | |
Fix security hole in GateKeeperResponse am: 658c53c47c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925
Change-Id: I809144ca234b9cd144b59a4666f75c5b18cc6b1f
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 66fee1e90aff..6b7a1e183794 100644 --- a/core/java/android/service/gatekeeper/GateKeeperResponse.java +++ b/core/java/android/service/gatekeeper/GateKeeperResponse.java @@ -103,7 +103,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 { |