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

Commit 6e92ef19 authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Check hidden API exemptions" into sc-dev am: edd06b48 am: 8627a9fa am: 1caafed4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26721087



Change-Id: Ib0293f605d435868b9c3d836c5ed1d3497969dcd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52fdfaa4 1caafed4

core/java/android/os/ZygoteProcess.java

+10 −0
Original line number Diff line number Diff line
@@ -431,6 +431,8 @@ public class ZygoteProcess { 
                throw new ZygoteStartFailedEx("Embedded newlines not allowed");

            } else if (arg.indexOf('\r') >= 0) {

                throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");

            } else if (arg.indexOf('\u0000') >= 0) {

                throw new ZygoteStartFailedEx("Embedded nulls not allowed");

            }

        }
@@ -972,6 +974,14 @@ public class ZygoteProcess { 
            return true;

        }



        for (/* NonNull */ String s : mApiDenylistExemptions) {

            // indexOf() is intrinsified and faster than contains().

            if (s.indexOf('\n') >= 0 || s.indexOf('\r') >= 0 || s.indexOf('\u0000') >= 0) {

                Slog.e(LOG_TAG, "Failed to set API denylist exemptions: Bad character");

                mApiDenylistExemptions = Collections.emptyList();

                return false;

            }

        }

        try {

            state.mZygoteOutputWriter.write(Integer.toString(mApiDenylistExemptions.size() + 1));

            state.mZygoteOutputWriter.newLine();