From 43d7dc2c8eaaa424697b084ae8731e43e564b138 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 29 Oct 2020 11:50:06 +0100
Subject: [PATCH] Remove NUL characters from file names

---
 app/src/main/java/eu/faircode/email/Helper.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index db0953d71a..23aa5515de 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1012,7 +1012,10 @@ public class Helper {
         if (name == null)
             return null;
 
-        return name.replaceAll("[?:\"*|/\\\\<>]", "_");
+        return name
+                // Canonical files names cannot contain NUL
+                .replace("\0", "")
+                .replaceAll("[?:\"*|/\\\\<>]", "_");
     }
 
     static String getExtension(String filename) {