diff options
author | 2011-06-07 13:17:17 -0700 | |
---|---|---|
committer | 2011-06-07 13:17:17 -0700 | |
commit | 3f6c77b7caa02193205cb6ce180e0eb5a7579aa6 (patch) | |
tree | f811ac1b87ff6368b62db25eca407badb37f0a81 | |
parent | 65abc4531f1222ffa04350a3afc6d61fcc77b2a3 (diff) |
Fix embedded spaces in tar stream EVEN HARDER
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
-rw-r--r-- | libs/utils/BackupHelpers.cpp | 4 | ||||
-rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libs/utils/BackupHelpers.cpp b/libs/utils/BackupHelpers.cpp index b433fd3cf318..f933199fe8d1 100644 --- a/libs/utils/BackupHelpers.cpp +++ b/libs/utils/BackupHelpers.cpp @@ -503,10 +503,10 @@ int write_tarfile(const String8& packageName, const String8& domain, needExtended = true; } - // Non-7bit-clean path or embedded spaces also mean needing pax extended format + // Non-7bit-clean path also means needing pax extended format if (!needExtended) { for (size_t i = 0; i < filepath.length(); i++) { - if ((filepath[i] & 0x80) != 0 || filepath[i] == ' ') { + if ((filepath[i] & 0x80) != 0) { needExtended = true; break; } diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index b568af12b62b..c28732e8d2b4 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -2859,6 +2859,7 @@ class BackupManagerService extends IBackupManager.Stub { final int end = offset + maxChars; for (int i = offset; i < end; i++) { final byte b = data[i]; + // Numeric fields in tar can terminate with either NUL or SPC if (b == 0 || b == ' ') break; if (b < '0' || b > ('0' + radix - 1)) { throw new IOException("Invalid number in header"); @@ -2871,8 +2872,8 @@ class BackupManagerService extends IBackupManager.Stub { String extractString(byte[] data, int offset, int maxChars) throws IOException { final int end = offset + maxChars; int eos = offset; - // tar string fields can end with either NUL or SPC - while (eos < end && data[eos] != 0 && data[eos] != ' ') eos++; + // tar string fields terminate early with a NUL + while (eos < end && data[eos] != 0) eos++; return new String(data, offset, eos-offset, "US-ASCII"); } |