From 07aa759b68f3198e565385eb23736984bb378d0f Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 27 Oct 2009 23:57:37 -0700 Subject: [PATCH] Fix segfault in case of the database lock not being available. We were nicely reporting the lock-aquisition failure, but then marching along trying to use the database object and just crashing badly. So don't do that. --- database.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/database.cc b/database.cc index 5555b0e3..71246eb4 100644 --- a/database.cc +++ b/database.cc @@ -489,6 +489,7 @@ notmuch_database_open (const char *path) } catch (const Xapian::Error &error) { fprintf (stderr, "A Xapian exception occurred: %s\n", error.get_msg().c_str()); + notmuch = NULL; } DONE: