summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles He <qiurui@google.com>2017-08-15 17:53:35 +0000
committerCharles He <qiurui@google.com>2017-08-15 17:53:35 +0000
commit4acf4fabf40c3e3a7b5cb23d01cab720dda86d31 (patch)
treee7fbdbb4763f5cd2ac8e207391e91d4668dfae3b
parent79ada733cc8fdeb75c3caade7405e54ff3d29c4a (diff)
parenta3c1de7e492048217c558283d2f679bad7f4a1e8 (diff)
downloadbase-4acf4fabf40c3e3a7b5cb23d01cab720dda86d31.tar.gz
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
-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);
}
}
}