summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles He <qiurui@google.com>2017-08-15 20:42:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-15 20:42:11 +0000
commit24587d57cfcdca9de98b7012543498c034e83c5c (patch)
treea7cd772e142eb02d943afe7e69169dbcbc685e77
parentfacc5e40fca108be7b0261b16d1be539ec8b4e85 (diff)
parent159cd14334860ee9b8de0a105af0fdc668a635e7 (diff)
downloadbase-24587d57cfcdca9de98b7012543498c034e83c5c.tar.gz
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
am: 159cd14334 Change-Id: Iaed779900e094a5951e24771ed1f1f55b0c1b014
-rw-r--r--core/java/android/service/gatekeeper/GateKeeperResponse.java2
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 a512957d6040..6ca6d8ac7100 100644
--- a/core/java/android/service/gatekeeper/GateKeeperResponse.java
+++ b/core/java/android/service/gatekeeper/GateKeeperResponse.java
@@ -85,6 +85,8 @@ public final class GateKeeperResponse implements Parcelable {
if (mPayload != null) {
dest.writeInt(mPayload.length);
dest.writeByteArray(mPayload);
+ } else {
+ dest.writeInt(0);
}
}
}