Fixes bug 695150 in the 1.4.x stream

Not sure yet if/how to push it back to 1.2.x

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

diff --git a/ChangeLog b/ChangeLog
index b6b37031bd55d90efe0f9bdd2816a7c7e30ec80a..41abf6d5114df6083b77a2afb4677d9406eef883 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,8 @@ Version 1.4.0 CVS
   - Fixed handling of encoding/decoding strings.
   - Fixed wrong array_slice call for a subset of the headers.
   - Allow encoded personal names in compose.php.
-  - Improved addresparsing from addresses coming from the compose form.
+  - Improved address parsing from addresses coming from the compose form.
+  - Fixed uninitialized indices when parsing attachments.
 
 Version 1.4.0 RC 2a
 -------------------

diff --git a/class/mime/Message.class.php b/class/mime/Message.class.php
index 0cec7e2432f7979f06a24c9cae2bbb706a1ae1c5..5f6a040a88261ff7188175133290bd302472e457 100644 (file)
--- a/class/mime/Message.class.php
+++ b/class/mime/Message.class.php
@@ -443,9 +443,9 @@ class Message {
 
             $hdr->date = getTimeStamp($d); /* argument 1: date */
             $hdr->subject = $arg_a[1];     /* argument 2: subject */
-            $hdr->from = $arg_a[2][0];     /* argument 3: from        */
-            $hdr->sender = $arg_a[3][0];   /* argument 4: sender      */
-            $hdr->replyto = $arg_a[4][0];  /* argument 5: reply-to    */
+            $hdr->from = is_array($arg_a[2]) ? $arg_a[2][0] : '';     /* argument 3: from        */
+            $hdr->sender = is_array($arg_a[3]) ? $arg_a[3][0] : '';   /* argument 4: sender      */
+            $hdr->replyto = is_array($arg_a[4]) ? $arg_a[4][0] : '';  /* argument 5: reply-to    */
             $hdr->to = $arg_a[5];          /* argument 6: to          */
             $hdr->cc = $arg_a[6];          /* argument 7: cc          */
             $hdr->bcc = $arg_a[7];         /* argument 8: bcc         */