X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=filter.c;h=7f8bcd5ce3da16f61d61fa0b670b8ae44dbbc1e6;hb=a2d4ea58437d93297c7f7e2e8efd4d48297ca46a;hp=338c6402bad0a824f1a80d9b871fcd7861d262df;hpb=8fd8454f3ee9d12dc5ffca25308c1054aeb2fb59;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index 338c640..7f8bcd5 100644
--- a/filter.c
+++ b/filter.c
@@ -1660,20 +1660,33 @@ vcard_parse_address(list_item item, char *line)
 
 	// vCard(post office box) - not used
 	strsep(&value, ";");
+	if(!value) return;
+
 	// vCard(the extended address)
 	item_fput(item, ADDRESS2, xstrdup(strsep(&value, ";")));
+	if(!value) return;
+
 	// vCard(the street address)
 	item_fput(item, ADDRESS, xstrdup(strsep(&value, ";")));
+	if(!value) return;
+
 	// vCard(the locality)
 	item_fput(item, CITY, xstrdup(strsep(&value, ";")));
+	if(!value) return;
+
 	// vCard(the region)
 	item_fput(item, STATE, xstrdup(strsep(&value, ";")));
+	if(!value) return;
+
 	// vCard(the postal code)
 	item_fput(item, ZIP, xstrdup(strsep(&value, ";")));
+	if(!value) return;
+
 	// vCard(the country name)
 	item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
 
-	if(*value) xfree(value);
+	// support of optional trailing ";" to the ADR field
+	if(value && *value) xfree(value);
 }
 
 static void