diff options
| author | Charles He <qiurui@google.com> | 2017-08-15 21:16:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-15 21:16:36 +0000 |
| commit | b0fa5855dc9eeeca8e3c8675fdd812871d935f0d (patch) | |
| tree | 2dfc22c603386049a27fcbb559f4a705145a385c /core/java | |
| parent | 0958d0339f215df6ab5a1469fc8ab251add3c647 (diff) | |
| parent | 0fa9328b80245e6170522bf74dbae6a33122fbcb (diff) | |
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
am: 0fa9328b80
Change-Id: I4fc74296d3da5fef830e9ffe0eedc74bb4fb047b
Diffstat (limited to 'core/java')
| -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); } } } |