From: Jani Nikula <jani@nikula.org>
To: Jani Nikula <jani@nikula.org>,
	notmuch@notmuchmail.org
Cc: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Subject: [RFC PATCH 2/6] cli/reply: check for NULL list first in
 scan_address_list()
Date: Sun, 19 Jun 2016 23:15:30 +0300
Message-Id:
 <ab2abc39d4d4041228fda9beec05cc90b49e54b4.1466366737.git.jani@nikula.org>
In-Reply-To: <cover.1466366737.git.jani@nikula.org>
References: <cover.1466284726.git.jani@nikula.org>
 <cover.1466366737.git.jani@nikula.org>
In-Reply-To: <cover.1466366737.git.jani@nikula.org>
References: <cover.1466366737.git.jani@nikula.org>
Precedence: list

Support passing NULL list later on. Also use it to simplify the
recursion.
---
 notmuch-reply.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 9b78ea2c2b20..d90f46f9bed3 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;
-- 
2.1.4