From: David Bremner <david@tethera.net>
Date: Mon, 24 May 2021 00:08:29 +0000 (-0300)
Subject: lib/message: use passed database for error handling
X-Git-Tag: archive/debian/0.33_rc0-1~60
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=651a1b085be106aa9761c464429d88e34157fc2a;hp=b0a11dbc3822271e948f625ca326e86ff68f2e57

lib/message: use passed database for error handling

'message' should always be initialized if we reach here, but in case it
is not, we still want to be able to log an error message.
---

diff --git a/lib/message.cc b/lib/message.cc
index 560f2746..63b216b6 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -288,7 +288,7 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
 
 	doc_id = _notmuch_database_generate_doc_id (notmuch);
     } catch (const Xapian::Error &error) {
-	_notmuch_database_log (notmuch_message_get_database (message),
+	_notmuch_database_log (notmuch,
 			       "A Xapian exception occurred creating message: %s\n",
 			       error.get_msg ().c_str ());
 	notmuch->exception_reported = true;