commit eabcb8f6f5a54c3d83224db9bb06aec26fc2b220
author Ekin Oguz <ekinoguz@google.com> Mon Jun 04 13:35:50 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Sep 14 20:47:04 2018 +0000
tree 180c85cd8590e3a184d49aa5a965b44050e8252f
parent 408187b0673452e2ff9c1d1faff36630be39cf5c

Filter Attachment file name of forward slashes for .eml attachments.

Bug: b/66230183
Change-Id: I6715358a07bc5bd9de6ee877b4a235a974767536
(cherry picked from commit 53b40fd185517ca82a0c4305570c5a5e3b83abf0)

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;