diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-01-15 18:59:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-15 18:59:09 +0000 |
| commit | 5d406ad38446af78bc904d8141d2856a6a5a8dfd (patch) | |
| tree | 3283925f87481e81b5d4ee15ee6603e8a852c3a5 | |
| parent | 64cb0d20fdd097b73cab76add01787c590aefefa (diff) | |
| parent | 5c08fb8cbeb045b9ce447443208e87f42604d168 (diff) | |
| download | android_packages_providers_DownloadProvider-5d406ad38446af78bc904d8141d2856a6a5a8dfd.tar.gz android_packages_providers_DownloadProvider-5d406ad38446af78bc904d8141d2856a6a5a8dfd.tar.bz2 android_packages_providers_DownloadProvider-5d406ad38446af78bc904d8141d2856a6a5a8dfd.zip | |
Use resolved path for both checking and opening.
am: 5c08fb8cbe
* commit '5c08fb8cbeb045b9ce447443208e87f42604d168':
Use resolved path for both checking and opening.
| -rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 10 | ||||
| -rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 4b23024f..2d914c41 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -1230,9 +1230,15 @@ public final class DownloadProvider extends ContentProvider { throw new FileNotFoundException("No filename found."); } - final File file = new File(path); + final File file; + try { + file = new File(path).getCanonicalFile(); + } catch (IOException e) { + throw new FileNotFoundException(e.getMessage()); + } + if (!Helpers.isFilenameValid(getContext(), file)) { - throw new FileNotFoundException("Invalid file: " + file); + throw new FileNotFoundException("Invalid file path: " + file); } final int pfdMode = ParcelFileDescriptor.parseMode(mode); diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index eb071395..7ca50bb1 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -341,7 +341,6 @@ public class Helpers { static boolean isFilenameValid(Context context, File file) { final File[] whitelist; try { - file = file.getCanonicalFile(); whitelist = new File[] { context.getFilesDir().getCanonicalFile(), context.getCacheDir().getCanonicalFile(), |