Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b8e729f authored by Pawan Wagh's avatar Pawan Wagh
Browse files

Throw exception when trying to allocate memory above 1MB limit 

BadParcelableException is thrown when creating arrays which use more
than 1MB memory

Bug: 205282403
Test: m && acloud delete --all && acloud create --local-image --local-instance
&& atest -c android.os.ParcelTest

Change-Id: I087a2b0eec0fa3c6987ae8709c1c119577551001
parent 247d2b12

core/java/android/os/Parcel.java

+10 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import java.lang.reflect.Array; 
import java.lang.reflect.Field;

import java.lang.reflect.Modifier;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.Map;
@@ -1551,6 +1552,9 @@ public final class Parcel { 
            }

        } catch (ArithmeticException e) {

            Log.e(TAG, "ArithmeticException occurred while multiplying dimensions " + e);

            BadParcelableException badParcelableException = new BadParcelableException("Estimated "

                    + "array length is too large. Array Dimensions:" + Arrays.toString(dimensions));

            SneakyThrow.sneakyThrow(badParcelableException);

        }

        ensureWithinMemoryLimit(typeSize, totalObjects);

    }
@@ -1562,12 +1566,18 @@ public final class Parcel { 
        } catch (ArithmeticException e) {

            Log.e(TAG, "ArithmeticException occurred while multiplying values " + typeSize

                    + " and "  + length + " Exception: " + e);

            BadParcelableException badParcelableException = new BadParcelableException("Estimated "

                    + "allocation size is too large. typeSize: " + typeSize + " length: " + length);

            SneakyThrow.sneakyThrow(badParcelableException);

        }



        boolean isInBinderTransaction = Binder.isDirectlyHandlingTransaction();

        if (isInBinderTransaction && (estimatedAllocationSize > ARRAY_ALLOCATION_LIMIT)) {

            Log.e(TAG, "Trying to Allocate " + estimatedAllocationSize

                    + " memory, In Binder Transaction : " + isInBinderTransaction);

            BadParcelableException e = new BadParcelableException("Allocation of size "

                    + estimatedAllocationSize + " is above allowed limit of 1MB");

            SneakyThrow.sneakyThrow(e);

        }

    }