summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEkin Oguz <ekinoguz@google.com>2018-06-04 13:35:50 -0700
committerTim Schumacher <timschumi@gmx.de>2018-08-08 20:52:56 +0200
commitd7a7b6476ec2d72db11f083907bb02e375bf1b18 (patch)
tree5b43c261a40a2700b40ad656bf09ad7130dd929b
parent605ad24f835b6ba23ef5ec74255cbedb841827bd (diff)
downloadandroid_packages_apps_UnifiedEmail-d7a7b6476ec2d72db11f083907bb02e375bf1b18.tar.gz
android_packages_apps_UnifiedEmail-d7a7b6476ec2d72db11f083907bb02e375bf1b18.tar.bz2
android_packages_apps_UnifiedEmail-d7a7b6476ec2d72db11f083907bb02e375bf1b18.zip
Filter Attachment file name of forward slashes for .eml attachments.
Bug: b/66230183 Change-Id: I6715358a07bc5bd9de6ee877b4a235a974767536 (cherry picked from commit 53b40fd185517ca82a0c4305570c5a5e3b83abf0)
-rw-r--r--src/com/android/mail/providers/Attachment.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/mail/providers/Attachment.java b/src/com/android/mail/providers/Attachment.java
index b8e86edeb..af4b3e326 100644
--- a/src/com/android/mail/providers/Attachment.java
+++ b/src/com/android/mail/providers/Attachment.java
@@ -245,6 +245,11 @@ public class Attachment implements Parcelable {
name = MimeUtility.getHeaderParameter(contentDisposition, "filename");
}
+ // Prevent passing in a file path as part of the name.
+ if (name != null) {
+ name = name.replace('/', '_');
+ }
+
contentType = MimeType.inferMimeType(name, part.getMimeType());
uri = EmlAttachmentProvider.getAttachmentUri(emlFileUri, messageId, cid);
contentUri = uri;