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 iCWuISjPAV8kOwAA0tVLHw (envelope-from ) for ; Sun, 05 Jul 2020 13:01:28 +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 MC+rHSjPAV9ZVgAA1q6Kng (envelope-from ) for ; Sun, 05 Jul 2020 13:01:28 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 41DD69408E8 for ; Sun, 5 Jul 2020 13:01:28 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A0A6D1FCB6; Sun, 5 Jul 2020 09:01:06 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 3F7D01FC84 for ; Sun, 5 Jul 2020 09:00:58 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 39BEF613B0; Sun, 5 Jul 2020 09:00:58 -0400 (EDT) Received: (nullmailer pid 4057418 invoked by uid 1000); Sun, 05 Jul 2020 13:00:51 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 04/11] lib: catch Xapian exceptions in n_m_get_tags Date: Sun, 5 Jul 2020 10:00:19 -0300 Message-Id: <20200705130025.4057292-5-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200705130025.4057292-1-david@tethera.net> References: <20200705130025.4057292-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 64XHTLR6DTSVXUGRJW53TGXWID7XHNWT X-Message-ID-Hash: 64XHTLR6DTSVXUGRJW53TGXWID7XHNWT 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 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 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 1.53 X-TUID: zWmvMS4Rp0LP This allows the function to return an error value rather than crashing. --- lib/message.cc | 7 ++++++- test/T560-lib-error.sh | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/message.cc b/lib/message.cc index 6d78663b..9b7d4bc4 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -1231,7 +1231,12 @@ notmuch_message_get_tags (notmuch_message_t *message) { notmuch_tags_t *tags; - _notmuch_message_ensure_metadata (message, message->tag_list); + try { + _notmuch_message_ensure_metadata (message, message->tag_list); + } catch (Xapian::Error &error) { + LOG_XAPIAN_EXCEPTION (message, error); + return NULL; + } tags = _notmuch_tags_create (message, message->tag_list); /* _notmuch_tags_create steals the reference to the tag_list, but diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index 94a0f470..cda3df78 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -487,7 +487,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "Handle getting tags from closed database" -test_subtest_known_broken cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} { notmuch_tags_t *result; -- 2.27.0