commit 94a5953e5eef62079231756161120199478953b7
author Ekin Oguz <ekinoguz@google.com> Tue Jun 05 17:42:03 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 05 17:42:03 2018 -0700
tree 29b80ca490a3139e56c31850e20dbaa604fb90b2
parent 8ef85d73cb4d256488c62768195255354b54e407
parent 7a91782d0f3c403e63256fd78ee83e108dff66ee

[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 am: c59403a72e am: ad27add34d am: c6358f6660
am: 7a91782d0f

Change-Id: I1e7b342c874a458a994bb00c764de0e5d25652b5

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 4ed33f8..7f56d1d 100644
--- a/src/com/android/mail/providers/Attachment.java
+++ b/src/com/android/mail/providers/Attachment.java
@@ -256,6 +256,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;