summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles He <qiurui@google.com>2017-08-15 17:52:57 +0000
committerCharles He <qiurui@google.com>2017-08-15 17:52:57 +0000
commita3c1de7e492048217c558283d2f679bad7f4a1e8 (patch)
tree8c6016618cd23720461a7185962dc661e35c8ec6
parent30d3df57dcf81103928841b149afe2b8b6d41750 (diff)
parent6dfc8d8d4da9b419914d603e27e218e522119f2a (diff)
downloadbase-a3c1de7e492048217c558283d2f679bad7f4a1e8.tar.gz
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
-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);
}
}
}