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

Commit 68f591b1 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24607 into eclair 

* changes:
  Try not to crash the system server because of corrupt restore data
parents 181b31a0 5a8a1151

services/java/com/android/server/PackageManagerBackupAgent.java

+7 −0
Original line number Diff line number Diff line
@@ -327,6 +327,13 @@ public class PackageManagerBackupAgent extends BackupAgent { 
        try {

            int num = in.readInt();

            Log.v(TAG, " ... unflatten read " + num);



            // Sensical?

            if (num > 20) {

                Log.e(TAG, "Suspiciously large sig count in restore data; aborting");

                throw new IllegalStateException("Bad restore state");

            }



            sigs = new Signature[num];

            for (int i = 0; i < num; i++) {

                int len = in.readInt();