commit 6f463bac1735b61ac0b35934ae20ba2265acf632
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jun 04 20:37:57 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jun 04 20:37:57 2018 +0000
tree 958fb4a201e432f86b1e3a74e23c424ef5b02a4a
parent 29f9af1b0a4c66ae0f39b8c4643d95713df44b38
parent be56f659314cb3487f3418e59f363d95047b7712

[automerger] Filter Attachment file name of forward slashes for .eml attachments. am: 53b40fd185 am: eb8ae2ec17 am: be56f65931

Change-Id: I154717bf57670339a9a3300e5a6bb15e11b4c0da

src/com/android/mail/providers/Attachment.java

diff --git a/src/com/android/mail/providers/Attachment.java b/src/com/android/mail/providers/Attachment.java
index b8e86ed..af4b3e3 100644
--- a/src/com/android/mail/providers/Attachment.java
+++ b/src/com/android/mail/providers/Attachment.java
@@ -245,6 +245,11 @@
                 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;