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

Avoid access of a Xapian iterator's object when there's nothing there.

Browse source 
This eliminates a crash when a message (either corrupted or a non-mail
file that wasn't properly detected as not being mail) has no In-Reply-To
header, (and so few terms that trying to skip to the prefix of the
In-Reply-To terms actually brings us to the end of the termlist).
This commit is contained in:
Carl Worth 2009-11-20 12:06:11 +01:00
parent f6ca697e27
commit 31b54bc787
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/message.cc
View file

@ -285,7 +285,8 @@ _notmuch_message_get_in_reply_to (notmuch_message_t *message)
i = message->doc.termlist_begin (); i = message->doc.termlist_begin ();
i.skip_to (prefix); i.skip_to (prefix);
in_reply_to = *i; if (i != message->doc.termlist_end ())
in_reply_to = *i;
/* It's perfectly valid for a message to have no In-Reply-To /* It's perfectly valid for a message to have no In-Reply-To
* header. For these cases, we return an empty string. */ * header. For these cases, we return an empty string. */
@ -332,10 +333,10 @@ notmuch_message_get_thread_id (notmuch_message_t *message)
return message->thread_id; return message->thread_id;
i = message->doc.termlist_begin (); i = message->doc.termlist_begin ();
i.skip_to (prefix); i.skip_to (prefix);
id = *i; if (i != message->doc.termlist_end ())
id = *i;
if (i == message->doc.termlist_end () || id[0] != *prefix) 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",
@ -466,7 +467,7 @@ notmuch_message_get_tags (notmuch_message_t *message)
i.skip_to (prefix); i.skip_to (prefix);
while (1) { while (i != end) {
tag = *i; tag = *i;
if (tag.empty () || tag[0] != *prefix) if (tag.empty () || tag[0] != *prefix)