debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 20:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent segmentation fault in notmuch_database_close

Browse source 
Previously opening a notmuch database in read write mode that has been
locked resulted in the notmuch_database_open function executing
notmuch_database_close as a cleanup function. notmuch_database_close
failed to check whether the xapian database has in fact been created.

Add a check whether the xapian database object has actually been
created before trying to call its flush method.

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
This commit is contained in:
Justus Winter 2012-02-19 00:56:57 +01:00 committed by David Bremner
parent 0b2ff308ec
commit e2e95caa51
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/database.cc
View file

@ -716,7 +716,8 @@ void
notmuch_database_close (notmuch_database_t *notmuch) notmuch_database_close (notmuch_database_t *notmuch)
{ {
try { try {
if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE) if (notmuch->xapian_db != NULL &&
notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
(static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush (); (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();
} catch (const Xapian::Error &error) { } catch (const Xapian::Error &error) {
if (! notmuch->exception_reported) { if (! notmuch->exception_reported) {