From: Jani Nikula <jani@nikula.org>
Date: Tue, 13 Sep 2016 17:14:18 +0000 (+0300)
Subject: cli/reply: check for NULL list first in scan_address_list()
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca82d481a1040ed3a47ad9c5e7cf7ec16e5e2ced;p=notmuch.git

cli/reply: check for NULL list first in scan_address_list()

Support passing NULL list later on. Also use it to simplify the
recursion.
---

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 9b78ea2c..d90f46f9 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -192,6 +192,9 @@ scan_address_list (InternetAddressList *list,
     int i;
     unsigned int n = 0;
 
+    if (list == NULL)
+	return 0;
+
     for (i = 0; i < internet_address_list_length (list); i++) {
 	address = internet_address_list_get_address (list, i);
 	if (INTERNET_ADDRESS_IS_GROUP (address)) {
@@ -200,9 +203,6 @@ scan_address_list (InternetAddressList *list,
 
 	    group = INTERNET_ADDRESS_GROUP (address);
 	    group_list = internet_address_group_get_members (group);
-	    if (group_list == NULL)
-		continue;
-
 	    n += scan_address_list (group_list, config, message, type, user_from);
 	} else {
 	    InternetAddressMailbox *mailbox;