From 707b50e61bca895e9d5e54c5f4061d3cace615b3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Wed, 28 Jul 2010 22:19:31 +0000
Subject: [PATCH] * StrBufSanitizeEmailRecipientVector() fix bug cutting one of
 the email address

---
 libcitadel/lib/stringbuf.c                  | 5 +++--
 libcitadel/tests/email_recipientstrings.txt | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index fa51fcce7..fcbd1daa7 100644
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -2547,14 +2547,15 @@ StrBuf *StrBufSanitizeEmailRecipientVector(const StrBuf *Recp,
 			else {
 
 				pch = EmailEnd + 1;
-				while ((EmailEnd > UserStart) && 
+				while ((EmailEnd > UserStart) && !gt &&
 				       ((*EmailEnd == ',') ||
 					(*EmailEnd == '>') ||
 					(isspace(*EmailEnd))))
 				{
 					if (*EmailEnd == '>')
 						gt = 1;
-					EmailEnd--;
+					else 
+						EmailEnd--;
 				}
 				if (EmailEnd == UserStart)
 					break;
diff --git a/libcitadel/tests/email_recipientstrings.txt b/libcitadel/tests/email_recipientstrings.txt
index 7009b2388..14d66c261 100644
--- a/libcitadel/tests/email_recipientstrings.txt
+++ b/libcitadel/tests/email_recipientstrings.txt
@@ -2,3 +2,5 @@
 dothebart
 dothebart@uncensored.citadel.org
 Art Cancro <ajc@uncensored.citadel.org>, Art Cancro <ajc@uncensored.citadel.org>
+Hüttemann Detlef
+"Hüttemann Detlef"<somebody@cosmocode.de>,Wilfried Goesgens <me.in@o3sis.com>, Lang Adrian <somebodyelse@cosmocode.de>, Gohr Andreas <da_splitbaiin@cosmocode.de>
-- 
2.30.2