From 2fb6356ab65bc37c90845d1650e93c11cf0adda4 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sat, 12 Mar 2022 14:58:19 +0200
Subject: [PATCH] xapian-utils: xapian_try: also catch std::exception

---
 lib/utils/mu-xapian-utils.hh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/utils/mu-xapian-utils.hh b/lib/utils/mu-xapian-utils.hh
index 4c2d6ba9..66551146 100644
--- a/lib/utils/mu-xapian-utils.hh
+++ b/lib/utils/mu-xapian-utils.hh
@@ -34,6 +34,8 @@ try {
 	g_critical("%s: xapian error '%s'", __func__, xerr.get_msg().c_str());
 } catch (const std::runtime_error& re) {
 	g_critical("%s: error: %s", __func__, re.what());
+} catch (const std::exception& e) {
+	g_critical("%s: caught exception: %s", __func__, e.what());
 } catch (...) {
 	g_critical("%s: caught exception", __func__);
 }
@@ -49,6 +51,9 @@ try {
 } catch (const std::runtime_error& re) {
 	g_critical("%s: error: %s", __func__, re.what());
 	return static_cast<Default>(def);
+} catch (const std::exception& e) {
+	g_critical("%s: caught exception: %s", __func__, e.what());
+	return static_cast<Default>(def);
 } catch (...) {
 	g_critical("%s: caught exception", __func__);
 	return static_cast<Default>(def);