Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 68f591b1: Merge change 24607 into eclair

Browse Source 
Merge commit '68f591b17537cb437ca0b25d00a6d3d08e507abb' into eclair-plus-aosp

* commit '68f591b17537cb437ca0b25d00a6d3d08e507abb':
  Try not to crash the system server because of corrupt restore data
This commit is contained in:
Christopher Tate
2009-09-10 16:22:15 -07:00
committed by Android Git Automerger
parent 95e022ec6a 68f591b175
commit b7024b1cf1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/PackageManagerBackupAgent.java
View File

@@ -327,6 +327,13 @@ public class PackageManagerBackupAgent extends BackupAgent {
try { try {
int num = in.readInt(); int num = in.readInt();
Log.v(TAG, " ... unflatten read " + num); 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]; sigs = new Signature[num];
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
int len = in.readInt(); int len = in.readInt();