source: npl/overig/libvmime/vmime-backport-mailboxList-parser-29954e5.diff @ d7191d1

src/mailboxList.cpp

@@ -22 +22 @@
 //
 
 #include "vmime/mailboxList.hpp"
+#include "vmime/mailboxGroup.hpp"
 #include "vmime/exception.hpp"
 
 
@@ -199 +200 @@
 void mailboxList::parse(const string& buffer, const string::size_type position,
         const string::size_type end, string::size_type* newPosition)
 {
-        m_list.parse(buffer, position, end, newPosition);
+        string::size_type pos = position;
+
+        while (pos < end)
+        {
+                ref <address> parsedAddress = address::parseNext(buffer, pos, end, &pos);
+
+                if (parsedAddress != NULL)
+                {
+                        if (parsedAddress->isGroup())
+                        {
+                                ref <mailboxGroup> group = parsedAddress.staticCast <mailboxGroup>();
+
+                                for (size_t i = 0 ; i < group->getMailboxCount() ; ++i)
+                                {
+                                        m_list.appendAddress(group->getMailboxAt(i));
+                                }
+                        }
+                        else
+                        {
+                                m_list.appendAddress(parsedAddress);
+                        }
+                }
+        }
+
+        setParsedBounds(position, end);
+
+        if (newPosition)
+                *newPosition = end;
 }
 
 

vmime/address.hpp

@@ -65 +65 @@
 
         virtual ref <component> clone() const = 0;
 
-protected:
 
         /** Parse an address from an input buffer.
           *