Merge "Verify number of Map entries written to Parcel"

2018-08-29 18:15:31 +00:00
parent f156ea7353 80b9d69d73
commit 0ce807abd5
1 changed files with 9 additions and 1 deletions
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -846,11 +846,19 @@ public final class Parcel {
            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!");
+        }
+
    }

    /**