From: Jani Nikula <jani@nikula.org>
Date: Sun, 3 Nov 2013 12:24:42 +0000 (+0200)
Subject: lib: construct compactor within try block to catch any exceptions
X-Git-Tag: 0.17_rc1~80
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=8e4e537ceefec51fc811d0be3027572a904ba38c

lib: construct compactor within try block to catch any exceptions

Constructors may also throw exceptions. Catch them.
---

diff --git a/lib/database.cc b/lib/database.cc
index 20e5ec23..3dfea0f4 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -864,7 +864,6 @@ notmuch_database_compact (const char* path,
 			  notmuch_compact_status_cb_t status_cb)
 {
     void *local = talloc_new (NULL);
-    NotmuchCompactor compactor(status_cb);
     char *notmuch_path, *xapian_path, *compact_xapian_path;
     char *old_xapian_path = NULL;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
@@ -910,6 +909,8 @@ notmuch_database_compact (const char* path,
     }
 
     try {
+	NotmuchCompactor compactor(status_cb);
+
 	compactor.set_renumber(false);
 	compactor.add_source(xapian_path);
 	compactor.set_destdir(compact_xapian_path);