diff options
author | Rohan Shah <shahrk@google.com> | 2016-08-19 20:23:08 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-19 20:23:08 +0000 |
commit | 093c6081060f231f4621f64570a78cc3ef7ad82d (patch) | |
tree | f45cde6778ecf8d5593b26702d7e604067e5896e | |
parent | d1cb6efd81ab7e792fb4eb01a70f79570124786f (diff) | |
parent | 9b35eea4c5f14ad34d0742e80016c08f219cf494 (diff) | |
download | Email-093c6081060f231f4621f64570a78cc3ef7ad82d.tar.gz |
Limit account id and id to longs am: 9794d7e821 am: 4fc61f9a45
am: 9b35eea4c5
Change-Id: Ia3ba22bf28426aa589231168a8ee24a35cf4ce49
-rw-r--r-- | provider_src/com/android/email/provider/AttachmentProvider.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/provider_src/com/android/email/provider/AttachmentProvider.java b/provider_src/com/android/email/provider/AttachmentProvider.java index c64fb4e4c..0abed9712 100644 --- a/provider_src/com/android/email/provider/AttachmentProvider.java +++ b/provider_src/com/android/email/provider/AttachmentProvider.java @@ -166,8 +166,8 @@ public class AttachmentProvider extends ContentProvider { long callingId = Binder.clearCallingIdentity(); try { List<String> segments = uri.getPathSegments(); - String accountId = segments.get(0); - String id = segments.get(1); + final long accountId = Long.parseLong(segments.get(0)); + final long id = Long.parseLong(segments.get(1)); String format = segments.get(2); if (AttachmentUtilities.FORMAT_THUMBNAIL.equals(format)) { int width = Integer.parseInt(segments.get(3)); @@ -176,8 +176,7 @@ public class AttachmentProvider extends ContentProvider { File dir = getContext().getCacheDir(); File file = new File(dir, filename); if (!file.exists()) { - Uri attachmentUri = AttachmentUtilities. - getAttachmentUri(Long.parseLong(accountId), Long.parseLong(id)); + Uri attachmentUri = AttachmentUtilities.getAttachmentUri(accountId, id); Cursor c = query(attachmentUri, new String[] { Columns.DATA }, null, null, null); if (c != null) { @@ -218,9 +217,14 @@ public class AttachmentProvider extends ContentProvider { } else { return ParcelFileDescriptor.open( - new File(getContext().getDatabasePath(accountId + ".db_att"), id), + new File(getContext().getDatabasePath(accountId + ".db_att"), + String.valueOf(id)), ParcelFileDescriptor.MODE_READ_ONLY); } + } catch (NumberFormatException e) { + LogUtils.e(Logging.LOG_TAG, + "AttachmentProvider.openFile: Failed to open as id is not a long"); + return null; } finally { Binder.restoreCallingIdentity(callingId); } |