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

Commit 43288ab4 authored by Achim Thesmann's avatar Achim Thesmann
Browse files

Tweak WTF logging of Parcel size mismatch 

Logs even if the thrown BadParcelException is handled by the client process, to improve visibility of potential problems. Also adds the information how we handle the failure (throw/ignore).

Test: atest ParcelTest
Bug: 416031865, 384586487
Flag: android.security.fail_on_parcel_size_mismatch
Change-Id: I58f9bd776ced81724309713df94b01c3c66febb8
parent ffc9c3fe

core/java/android/os/Parcel.java

+5 −3
Original line number Diff line number Diff line
@@ -4716,12 +4716,14 @@ public final class Parcel { 
            object = readValue(type, loader, clazz, itemTypes);

            int actual = dataPosition() - start;

            if (actual != length) {

                boolean failOnMismatch = failOnParcelSizeMismatch();

                String msg = "Unparcelling of " + object + " of type " + Parcel.valueTypeToString(

                        type) + "  consumed " + actual + " bytes, but " + length + " expected.";

                if (failOnParcelSizeMismatch()) {

                        type) + "  consumed " + actual + " bytes, but " + length + " expected."

                        + (failOnMismatch ? " [throwing]" : " [ignored]");

                Slog.wtfStack(TAG, msg);

                if (failOnMismatch) {

                    throw new BadParcelableException(msg);

                }

                Slog.wtfStack(TAG, msg);

            }

        } else {

            object = readValue(type, loader, clazz, itemTypes);