debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-18 21:45:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

message_get_thread_id: Generate internal error if message has no thread ID.

Browse source 
This case was happening when a message had its own message ID in its
In-Reply-To header. The thread-resolution code would find the
partially constructed message, (with no thread ID yet), get garbage
from this function, and then march right along with that garbage.

With this commit, a self-cyclic message like this will now trigger an
internal error rather than marching along silienty. (And a subsequent
commit will remove the call to this function in this case.)
This commit is contained in:
Carl Worth 2009-11-17 11:07:38 -08:00
parent 24a25ffba9
commit f7eaeff242
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/message.cc
View file

@ -320,31 +320,39 @@ _notmuch_message_get_in_reply_to (notmuch_message_t *message)
const char * const char *
notmuch_message_get_thread_id (notmuch_message_t *message) notmuch_message_get_thread_id (notmuch_message_t *message)
{ {
const char *prefix = _find_prefix ("thread");
Xapian::TermIterator i; Xapian::TermIterator i;
std::string id;
/* This code is written with the assumption that "thread" has a
* single-character prefix. */
assert (strlen (prefix) == 1);
if (message->thread_id) if (message->thread_id)
return message->thread_id; return message->thread_id;
i = message->doc.termlist_begin (); i = message->doc.termlist_begin ();
i.skip_to (_find_prefix ("thread"));
if (i == message->doc.termlist_end ()) i.skip_to (prefix);
id = *i;
if (i == message->doc.termlist_end () || id[0] != *prefix)
INTERNAL_ERROR ("Message with document ID of %d has no thread ID.\n", INTERNAL_ERROR ("Message with document ID of %d has no thread ID.\n",
message->doc_id); message->doc_id);
message->thread_id = talloc_strdup (message, (*i).c_str () + 1); message->thread_id = talloc_strdup (message, id.c_str () + 1);
#if DEBUG_DATABASE_SANITY #if DEBUG_DATABASE_SANITY
i++; i++;
id = *i;
if (i != message->doc.termlist_end () && if (i != message->doc.termlist_end () && id[0] == *prefix)
strncmp ((*i).c_str (), _find_prefix ("thread"),
strlen (_find_prefix ("thread"))) == 0)
{ {
INTERNAL_ERROR ("Message %s has duplicate thread IDs: %s and %s\n", INTERNAL_ERROR ("Message %s has duplicate thread IDs: %s and %s\n",
notmuch_message_get_message_id (message), notmuch_message_get_message_id (message),
message->thread_id, message->thread_id,
(*i).c_str () + 1); id.c_str () + 1);
} }
#endif #endif