Changeset 2066 in subversion

Timestamp:

Nov 19, 2008 9:33:35 AM (5 years ago)

Author:

alec

Message:

• Fix handling of some malformed messages (#1484438)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/imap.inc (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/11/19 (alec)
+----------
+- Fix handling of some malformed messages (#1484438)
 
 2008/11/15 (alec)

trunk/roundcubemail/program/lib/imap.inc

@@ -71 +71 @@
                 - added BYE response simple support for endless loop prevention
                 - added 3rd argument in iil_StartsWith* functions
+                - fix iil_C_FetchPartHeader() in some cases by use of iil_C_HandlePartBody()
 
 ********************************************************/
@@ -2369 +2370 @@
 
 function iil_C_FetchPartHeader(&$conn, $mailbox, $id, $part) {
-        $fp     = $conn->fp;
-        $result = false;
-        if (($part == 0) || (empty($part))) {
+
+        if (empty($part)) {
             $part = 'HEADER';
         } else {
@@ -2377 +2377 @@
         }
     
-        if (iil_C_Select($conn, $mailbox)) {
-                $key     = 'fh' . ($c++);
-                $request = $key . " FETCH $id (BODY.PEEK[$part])";
-                if (!iil_PutLine($fp, $request)) return false;
-                do {
-                        $line = chop(iil_ReadLine($fp, 200));
-                        $a    = explode(' ', $line);
-                        if (($line[0] == '*') && ($a[2] == 'FETCH')
-                                && ($line[strlen($line)-1] != ')')) {
-                                $line=iil_ReadLine($fp, 300);
-                                while (trim($line) != ')') {
-                                        $result .= $line;
-                                        $line=iil_ReadLine($fp, 300);
-                                }
-                        }
-                } while (strcmp($a[0], $key) != 0 && ($a[0] != '*' || $a[1] != 'BYE'));
-        }
-        
-        return $result;
+        return iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, 1);
 }