lib/message: check message type before deleting document

It isn't really clear how this worked before. Traversing the terms of
a document after deleting it from the database seems likely to be
undefined behaviour at best
This commit is contained in:
David Bremner 2023-07-20 09:08:00 -03:00
parent 08ca74d715
commit d93d49b6ae

View file

@ -1397,14 +1397,15 @@ _notmuch_message_delete (notmuch_message_t *message)
Xapian::PostingIterator thread_doc, thread_doc_end;
Xapian::PostingIterator mail_doc, mail_doc_end;
message->notmuch->writable_xapian_db->delete_document (message->doc_id);
/* look for a non-ghost message in the same thread */
/* if this was a ghost to begin with, we are done */
private_status = _notmuch_message_has_term (message, "type", "ghost", &is_ghost);
if (private_status)
return COERCE_STATUS (private_status,
"Error trying to determine whether message was a ghost");
message->notmuch->writable_xapian_db->delete_document (message->doc_id);
if (is_ghost)
return NOTMUCH_STATUS_SUCCESS;