From: David Bremner <david@tethera.net>
Date: Sat, 8 Aug 2020 14:16:47 +0000 (-0300)
Subject: lib/config: delay setting talloc destructor
X-Git-Tag: 0.32_rc0~170
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=43ba5ed7eca6e9f6433b8c2c2a9d834d4101b92a

lib/config: delay setting talloc destructor

If Xapian has thrown an exception, it is not safe to invoke the
destructor when freeing the list struct.
---

diff --git a/lib/config.cc b/lib/config.cc
index efab01e4..0b760dbc 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -133,8 +133,15 @@ notmuch_database_get_config_list (notmuch_database_t *notmuch,
     *out = list;
 
   DONE:
-    if (status && list)
-	talloc_free (list);
+    if (status) {
+	if (list) {
+	    talloc_free (list);
+	    if (status != NOTMUCH_STATUS_XAPIAN_EXCEPTION)
+		_notmuch_config_list_destroy (list);
+	}
+    }  else {
+	talloc_set_destructor (list, _notmuch_config_list_destroy);
+    }
 
     return status;
 }