Merge "Mitigating cache corruption in ArrayMap" into pi-dev

2018-05-14 23:03:39 +00:00
parent 5ca38cafe8 1938e34e42
commit 841de8fb31
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/util/ArrayMap.java
+++ b/core/java/android/util/ArrayMap.java
@@ -644,9 +644,11 @@ public final class ArrayMap<K, V> implements Map<K, V> {
        if (osize <= 1) {
            // Now empty.
            if (DEBUG) Log.d(TAG, "remove: shrink from " + mHashes.length + " to 0");
-            freeArrays(mHashes, mArray, osize);
+            final int[] ohashes = mHashes;
+            final Object[] oarray = mArray;
            mHashes = EmptyArray.INT;
            mArray = EmptyArray.OBJECT;
+            freeArrays(ohashes, oarray, osize);
            nsize = 0;
        } else {
            nsize = osize - 1;