commit c59403a72e1ccd84fdc21a561d8d3d4062e72eb8
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jun 04 20:38:09 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jun 04 20:38:09 2018 +0000
tree 180c85cd8590e3a184d49aa5a965b44050e8252f
parent 35ead32a64be94020af234cc7237d595bd8d8bf8
parent 4c2fb949c1e706aa1fe7f7961ca8be6781bac744

[automerger] Filter Attachment file name of forward slashes for .eml attachments. am: 53b40fd185 am: eb8ae2ec17 am: be56f65931 am: 6f463bac17 am: 015cde5a2b am: 1827d56264 am: 31ea2c26ff am: 3cb03481aa am: f16fc49b6a am: 4c2fb949c1

Change-Id: I808b58344b8ad7e89dd757e9b36c553a41713c69

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;