Fixed edge case decode MIME word

6 years ago · 1141cf735f
parent 8c0e81d6df
commit 1141cf735f
1 changed files with 12 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -717,13 +717,24 @@ public class MessageHelper {
        if (text == null)
            return null;

+        // https://tools.ietf.org/html/rfc2047
+        // encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
+
        int i = 0;
        while (i < text.length()) {
            int s = text.indexOf("=?", i);
            if (s < 0)
                break;

-            int e = text.indexOf("?=", s + 2);
+            int q1 = text.indexOf("?", s + 2);
+            if (q1 < 0)
+                break;
+
+            int q2 = text.indexOf("?", q1 + 1);
+            if (q2 < 0)
+                break;
+
+            int e = text.indexOf("?=", q2 + 1);
            if (e < 0)
                break;