From 1137341885d8dc451dddc2e01319fb0fab00bbc3 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 28 Jul 2011 15:13:33 -0700 Subject: Throw exception on odd length Signatures The old version of this code would silently truncate odd-length Signatures. However, this masks some bugs. Add a throw of IllegalArgumentException so users can easily see where they're getting bad input for Signatures. Also, go through the existing code and catch this exception or pre-check the input strings so system_server doesn't crash later. Bug: 5092338 Change-Id: I8c672c5eaeb738a92c4581ce0df09baf719980ef --- services/java/com/android/server/BackupManagerService.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'services/java/com/android/server/BackupManagerService.java') diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index 2e3d6dd44937..b489e337ca9b 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -3298,6 +3298,8 @@ class BackupManagerService extends IBackupManager.Stub { } } catch (NumberFormatException e) { Slog.w(TAG, "Corrupt restore manifest for package " + info.packageName); + } catch (IllegalArgumentException e) { + Slog.w(TAG, e.getMessage()); } return policy; -- cgit v1.2.3