From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id CBP1DTvPAV8BNAAA0tVLHw (envelope-from ) for ; Sun, 05 Jul 2020 13:01:47 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id CI+lCTvPAV/hawAAbx9fmQ (envelope-from ) for ; Sun, 05 Jul 2020 13:01:47 +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 (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D8C5094066C for ; Sun, 5 Jul 2020 13:01:46 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4E3F91FD52; Sun, 5 Jul 2020 09:01:13 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id D127E1FC97 for ; Sun, 5 Jul 2020 09:01:01 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id C6985613B0; Sun, 5 Jul 2020 09:01:01 -0400 (EDT) Received: (nullmailer pid 4057423 invoked by uid 1000); Sun, 05 Jul 2020 13:00:51 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 06/11] lib: catch Xapian exceptions in n_m_count_files Date: Sun, 5 Jul 2020 10:00:21 -0300 Message-Id: <20200705130025.4057292-7-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: I6UUBFJFIAEFQNP7WGCWR4K4EOZUTQIE X-Message-ID-Hash: I6UUBFJFIAEFQNP7WGCWR4K4EOZUTQIE 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 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 1.53 X-TUID: Ff0/RHLx6i9b This will require some care for the caller to check the sign, and not just add error returns into a running total. --- lib/message.cc | 7 ++++++- lib/notmuch.h | 3 ++- test/T560-lib-error.sh | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/message.cc b/lib/message.cc index 9b7d4bc4..b7d7c96b 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -1156,7 +1156,12 @@ notmuch_message_get_filenames (notmuch_message_t *message) int notmuch_message_count_files (notmuch_message_t *message) { - _notmuch_message_ensure_filename_list (message); + try { + _notmuch_message_ensure_filename_list (message); + } catch (Xapian::Error &error) { + LOG_XAPIAN_EXCEPTION (message, error); + return -1; + } return _notmuch_string_list_length (message->filename_list); } diff --git a/lib/notmuch.h b/lib/notmuch.h index b7de7652..0f386397 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -1412,7 +1412,8 @@ notmuch_message_get_replies (notmuch_message_t *message); /** * Get the total number of files associated with a message. - * @returns Non-negative integer + * @returns Non-negative integer for file count. + * @returns Negative integer for error. * @since libnotmuch 5.0 (notmuch 0.25) */ int diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index 8207727e..507e0e07 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -503,7 +503,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "Handle counting files from closed database" -test_subtest_known_broken cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} { int result; -- 2.27.0