diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-15 20:47:03 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-15 20:47:03 +0000 |
| commit | 0fa9328b80245e6170522bf74dbae6a33122fbcb (patch) | |
| tree | ff26c6359fe44599aa39f3638b409886283179c0 | |
| parent | 0e1976292de68ba5b1bec47fb4931c478420ecf8 (diff) | |
| parent | 24587d57cfcdca9de98b7012543498c034e83c5c (diff) | |
| download | base-0fa9328b80245e6170522bf74dbae6a33122fbcb.tar.gz | |
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
| -rw-r--r-- | core/java/android/service/gatekeeper/GateKeeperResponse.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/service/gatekeeper/GateKeeperResponse.java b/core/java/android/service/gatekeeper/GateKeeperResponse.java index 287dc76a9b01..9b529345851b 100644 --- a/core/java/android/service/gatekeeper/GateKeeperResponse.java +++ b/core/java/android/service/gatekeeper/GateKeeperResponse.java @@ -106,6 +106,8 @@ public final class GateKeeperResponse implements Parcelable { if (mPayload != null) { dest.writeInt(mPayload.length); dest.writeByteArray(mPayload); + } else { + dest.writeInt(0); } } } |