Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 173B1431FD0 for ; Fri, 9 Dec 2011 05:52:32 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vmfh-fG-rLqO for ; Fri, 9 Dec 2011 05:52:29 -0800 (PST) Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id A620D431FB6 for ; Fri, 9 Dec 2011 05:52:29 -0800 (PST) Received: from pps.filterd (mail-gw3 [127.0.0.1]) by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id pB9Dm534028231 for ; Fri, 9 Dec 2011 15:52:24 +0200 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) by mail-gw3.nixu.fi with ESMTP id 114cs0sb7h-1 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 09 Dec 2011 15:52:24 +0200 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id pB9DqOni006232 for ; Fri, 9 Dec 2011 15:52:24 +0200 From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [Patch 1/2] separate handling when addresses == NULL In-Reply-To: References: User-Agent: Notmuch/0.10.2+70~gf0e0053 (http://notmuchmail.org) Emacs/23.3.1 (i686-pc-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110, 1.0.211, 0.0.0000 definitions=2011-12-09_04:2011-12-09, 2011-12-08, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 suspectscore=1 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=6.0.2-1012030000 definitions=main-1112090094 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 13:52:32 -0000 When addresses is NULL, (future) addresses object cleanup is not needed. --- notmuch-show.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 603992a..c27ef6a 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -239,7 +239,11 @@ _extract_email_address (const void *ctx, const char *from) addresses = internet_address_list_parse_string (from); /* Bail if there is no address here. */ - if (addresses == NULL || internet_address_list_length (addresses) < 1) + if (addresses == NULL) + return email; + + /* Bail if there is no address here. */ + if (internet_address_list_length (addresses) < 1) goto DONE; /* Otherwise, just use the first address. */ -- 1.7.7.3