From d7a7b6476ec2d72db11f083907bb02e375bf1b18 Mon Sep 17 00:00:00 2001
From: Ekin Oguz <ekinoguz@google.com>
Date: Mon, 4 Jun 2018 13:35:50 -0700
Subject: 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/mail/providers/Attachment.java b/src/com/android/mail/providers/Attachment.java
index b8e86edeb..af4b3e326 100644
--- a/src/com/android/mail/providers/Attachment.java
+++ b/src/com/android/mail/providers/Attachment.java
@@ -245,6 +245,11 @@ public class Attachment implements Parcelable {
                 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;
-- 
cgit v1.2.3