extra safety check before we process groups

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

diff --git a/class/mime/Rfc822Header.class.php b/class/mime/Rfc822Header.class.php
index a331124dbba2e1e3ff9ccd23423c66658b93170c..91bd6267610a32fc04c1279fc83fbf9539cbffa6 100644 (file)
--- a/class/mime/Rfc822Header.class.php
+++ b/class/mime/Rfc822Header.class.php
@@ -389,14 +389,18 @@ class Rfc822Header {
                 break;
             case ':':  /* process the group addresses */
                 /* group marker */
-                $group = substr($address, 0, $pos);
-                $address = substr($address, $pos+1);
-                $result = $this->parseAddress($address, $ar, $addr_ar, $group, $lookup);
-                $addr_ar = $result[0];
-                $pos = $result[1];
-                $address = substr($address, $pos++);
-                $j = strlen($address);
-                $group = '';
+               if (strpos($address,';',$pos)) {
+                   $group = substr($address, 0, $pos);
+                   $address = substr($address, $pos+1);
+                   $result = $this->parseAddress($address, $ar, $addr_ar, $group, $lookup);
+                   $addr_ar = $result[0];
+                   $pos = $result[1];
+                   $address = substr($address, $pos++);
+                   $j = strlen($address);
+                   $group = '';
+               } else {
+                   $pos = $j;
+               }
                 break;
             case ' ':
                 ++$pos;