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

lib: Audit calls to notmuch_message_get_header to handle NULL return

Browse source 
Sebastian Spaeth reported [*] a segfault within libnotmuch when
running notmuch operations while an asyncronous offlineimap job had
removed some files from the mail store. Avoid this by handling all
cases where notmuch_message_get_header could return NULL.

[*] See message id:87d3xqti3o.fsf@SSpaeth.de on notmuch@notmuchmail.org
This commit is contained in:
Carl Worth 2010-04-24 06:46:43 -07:00
parent 7c421b87b0
commit 3dbef312fb
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/thread.cc
View file

@ -84,7 +84,7 @@ _thread_add_message (notmuch_thread_t *thread,
{ {
notmuch_tags_t *tags; notmuch_tags_t *tags;
const char *tag; const char *tag;
InternetAddressList *list; InternetAddressList *list = NULL;
InternetAddress *address; InternetAddress *address;
const char *from, *author; const char *from, *author;
@ -97,7 +97,9 @@ _thread_add_message (notmuch_thread_t *thread,
message); message);
from = notmuch_message_get_header (message, "from"); from = notmuch_message_get_header (message, "from");
list = internet_address_list_parse_string (from); if (from)
list = internet_address_list_parse_string (from);
if (list) { if (list) {
address = internet_address_list_get_address (list, 0); address = internet_address_list_get_address (list, 0);
if (address) { if (address) {
@ -115,7 +117,7 @@ _thread_add_message (notmuch_thread_t *thread,
if (! thread->subject) { if (! thread->subject) {
const char *subject; const char *subject;
subject = notmuch_message_get_header (message, "subject"); subject = notmuch_message_get_header (message, "subject");
thread->subject = talloc_strdup (thread, subject); thread->subject = talloc_strdup (thread, subject ? subject : "");
} }
for (tags = notmuch_message_get_tags (message); for (tags = notmuch_message_get_tags (message);
@ -135,6 +137,8 @@ _thread_set_subject_from_message (notmuch_thread_t *thread,
const char *cleaned_subject; const char *cleaned_subject;
subject = notmuch_message_get_header (message, "subject"); subject = notmuch_message_get_header (message, "subject");
if (! subject)
return;
if ((strncasecmp (subject, "Re: ", 4) == 0) || if ((strncasecmp (subject, "Re: ", 4) == 0) ||
(strncasecmp (subject, "Aw: ", 4) == 0) || (strncasecmp (subject, "Aw: ", 4) == 0) ||