From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id BiJhOKJtHV/YcwAA0tVLHw (envelope-from ) for ; Sun, 26 Jul 2020 11:48:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id AInAM6JtHV+TJwAA1q6Kng (envelope-from ) for ; Sun, 26 Jul 2020 11:48:50 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D56C79404C7 for ; Sun, 26 Jul 2020 11:48:48 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id EAF961FA17; Sun, 26 Jul 2020 07:48:38 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 761DC1F70D for ; Sun, 26 Jul 2020 07:48:34 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 25EA760AB8; Sun, 26 Jul 2020 07:48:32 -0400 (EDT) Received: (nullmailer pid 1447982 invoked by uid 1000); Sun, 26 Jul 2020 11:48:30 -0000 From: David Bremner To: David Bremner , notmuch@notmuchmail.org Subject: [PATCH] lib: return NULL from n_d_get_default_indexopts on error Date: Sun, 26 Jul 2020 08:48:28 -0300 Message-Id: <20200726114828.1447936-1-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <87tuy3my6z.fsf@tethera.net> References: <87tuy3my6z.fsf@tethera.net> MIME-Version: 1.0 Message-ID-Hash: EOZS6URKHQ4QLR5FXHAEZK3N7JVB46EP X-Message-ID-Hash: EOZS6URKHQ4QLR5FXHAEZK3N7JVB46EP X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Daniel Kahn Gillmor X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 0.03 X-TUID: C4m/7dU5FbPw This is a rare and probably serious programming error, so better not to silently return a default value. --- lib/indexopts.c | 2 +- lib/notmuch.h | 1 + test/T562-lib-database.sh | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/indexopts.c b/lib/indexopts.c index 1e8d180e..82a0026f 100644 --- a/lib/indexopts.c +++ b/lib/indexopts.c @@ -32,7 +32,7 @@ notmuch_database_get_default_indexopts (notmuch_database_t *db) char *decrypt_policy; notmuch_status_t err = notmuch_database_get_config (db, "index.decrypt", &decrypt_policy); if (err) - return ret; + return NULL; if (decrypt_policy) { if ((! (strcasecmp (decrypt_policy, "true"))) || diff --git a/lib/notmuch.h b/lib/notmuch.h index 1fe62914..f3cb0fe2 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -2325,6 +2325,7 @@ notmuch_config_list_destroy (notmuch_config_list_t *config_list); * added to the index. At the moment it is a featureless stub. * * @since libnotmuch 5.1 (notmuch 0.26) + * @retval NULL in case of error */ notmuch_indexopts_t * notmuch_database_get_default_indexopts (notmuch_database_t *db); diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh index 815c9856..d6097418 100755 --- a/test/T562-lib-database.sh +++ b/test/T562-lib-database.sh @@ -373,7 +373,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "get indexopts from closed database" -test_subtest_known_broken cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} { notmuch_indexopts_t *result; -- 2.27.0