commit d412cc6dc4b32755692921294ed78fbdded79277
author android-build-team Robot <android-build-team-robot@google.com> Wed Jun 06 07:23:55 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 06 07:23:55 2018 +0000
tree 29b80ca490a3139e56c31850e20dbaa604fb90b2
parent dbff1b0dc051c6d15048c2a835004a00704d3e02
parent 94a5953e5eef62079231756161120199478953b7

Snap for 4824048 from 94a5953e5eef62079231756161120199478953b7 to pi-release

Change-Id: I3dffd6083416e7a075c63e5c12dd4aebe22109de

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;