Changeset ad3c273 in github

Timestamp:

Nov 10, 2010 3:15:41 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

4d21f62

Parents:

d903fb4

Message:

• Fix handling of message bodies (quoted-printable encoded) with NULL characters (#1486189)

File:

• program/include/rcube_imap_generic.php (modified) (2 diffs)

program/include/rcube_imap_generic.php

@@ -2081 +2081 @@
                 $bytes -= $len;
 
+                // BASE64
                         if ($mode == 1) {
                                         $line = rtrim($line, "\t\r\n\0\x0B");
@@ -2093 +2094 @@
                                         else
                                                 $prev = '';
-
-                                        if ($file)
-                                                fwrite($file, base64_decode($line));
-                        else if ($print)
-                                                echo base64_decode($line);
-                                        else
-                                                $result .= base64_decode($line);
+                                        $line = base64_decode($line);
+                // QUOTED-PRINTABLE
                                 } else if ($mode == 2) {
                                         $line = rtrim($line, "\t\r\0\x0B");
-                                        if ($file)
-                                                fwrite($file, quoted_printable_decode($line));
-                        else if ($print)
-                                                echo quoted_printable_decode($line);
-                                        else
-                                                $result .= quoted_printable_decode($line);
+                    $line = quoted_printable_decode($line);
+                    // Remove NULL characters (#1486189)
+                    $line = str_replace("\x00", '', $line);
+                // UUENCODE
                                 } else if ($mode == 3) {
                                         $line = rtrim($line, "\t\r\n\0\x0B");
                                         if ($line == 'end' || preg_match('/^begin\s+[0-7]+\s+.+$/', $line))
                                                 continue;
-                                        if ($file)
-                                                fwrite($file, convert_uudecode($line));
-                        else if ($print)
-                                                echo convert_uudecode($line);
-                                        else
-                                                $result .= convert_uudecode($line);
+                    $line = convert_uudecode($line);
+                // default
                                 } else {
-                                        $line = rtrim($line, "\t\r\n\0\x0B");
-                                        if ($file)
-                                                fwrite($file, $line . "\n");
-                        else if ($print)
-                                                echo $line . "\n";
-                                        else
-                                                $result .= $line . "\n";
+                                        $line = rtrim($line, "\t\r\n\0\x0B") . "\n";
                                 }
+
+                        if ($file)
+                                        fwrite($file, $line);
+                        else if ($print)
+                                        echo $line;
+                                else
+                                        $result .= $line;
                 }
         }