commit 433e4173ecf36090352782c4b0d64bcf81e8da0c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Aug 30 20:46:05 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Aug 30 20:46:05 2018 +0000
tree d526c7c198fbe0fae351df78ab7eb62a2f4cc696
parent 3504302bb2780de95cde848f191dde7fedf7431c
parent 628cbe5c537c9171377885245696ff364460464e

[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53

Change-Id: Id32bd5aa02d5689873bb311eebc87f367af9a9d9

core/java/android/os/Parcel.java

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index f6e6ad6..0591fa8 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -692,11 +692,19 @@
             return;
         }
         Set<Map.Entry<String,Object>> entries = val.entrySet();
-        writeInt(entries.size());
+        int size = entries.size();
+        writeInt(size);
+
         for (Map.Entry<String,Object> e : entries) {
             writeValue(e.getKey());
             writeValue(e.getValue());
+            size--;
         }
+
+        if (size != 0) {
+            throw new BadParcelableException("Map size does not match number of entries!");
+        }
+
     }
 
     /**