commit 0ce807abd5216010a085db207ef7799d3e7f549c
author Michael Wachenschwanz <mwachens@google.com> Wed Aug 29 18:15:31 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 29 18:15:31 2018 +0000
tree d1814a1f011a7c0b434b7a733160cdadc6078499
parent f156ea735322029023f471a97106253a0dfac079
parent 80b9d69d7313dfb085265988f1296079a59e7759

Merge "Verify number of Map entries written to Parcel"

core/java/android/os/Parcel.java

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 7e7666a..cc6bb12 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -846,11 +846,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!");
+        }
+
     }
 
     /**