This will probably fix the incorrect parsing of literals inside

bodystructures. Somehow the offset of $i was incorrect when returning in the
parser. Note: due to the trial and error way (in some design fases) of programming when writing the
structure parser things has come a bit too complex. I have already developed
a new parser that will be used for 1.5. That parser will be a lot easier to
follow and less bug sensitive like the  one we use now.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4358 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/mime/Message.class.php b/class/mime/Message.class.php
index 59fa5eae717b3cde55bb2854b9b72f63e3da9441..c41f67097479540619b4466324b88db59111e3bc 100644 (file)
--- a/class/mime/Message.class.php
+++ b/class/mime/Message.class.php
@@ -387,7 +387,7 @@ class Message {
                     $arg_a[] = $this->parseLiteral($read, $i);
                    /* temp bugfix (SM 1.5 will have a working clean version)
                       too much work to implement that version right now */
-                   --$i;
+//                 --$i;
                     ++$arg_no;
                     break;
                 case 'N':
@@ -465,6 +465,9 @@ class Message {
           /* Now read the literal */
           $s = ($lit_cnt ? substr($read,$i,$lit_cnt): '');
           $i += $lit_cnt;
+          /* temp bugfix (SM 1.5 will have a working clean version)
+             too much work to implement that version right now */
+          --$i;
        } else { /* should never happen */
           $i += 3; /* } + \r + \n */
           $s = '';