From 95fc38d6d8425f8096d585650d487eae78a5faaf Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 10 Dec 2003 23:51:12 +0000 Subject: check m->fi != NULL before dereferencing it. 2003-12-10 Not Zed * em-folder-tree.c (em_folder_tree_get_folder_info__got): check m->fi != NULL before dereferencing it. svn path=/trunk/; revision=23916 --- mail/ChangeLog | 5 +++++ mail/em-folder-tree.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 01232494d7..310042ee0e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -29,6 +29,11 @@ * mail-component.c (mail_component_peek_tree_model): Don't ref the model. Also renamed s/get/peek/ +2003-12-10 Not Zed + + * em-folder-tree.c (em_folder_tree_get_folder_info__got): check + m->fi != NULL before dereferencing it. + 2003-12-10 Not Zed * em-format-html-display.c (efhd_multipart_signed): diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index e3b6aaa5f2..060f121626 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -625,7 +625,7 @@ em_folder_tree_get_folder_info__got (struct _mail_msg *mm) /* FIXME: camel's IMAP code is totally on crack here, @top's * folder info should be @fi and fi->child should be what we * want to fill our tree with... *sigh* */ - if (m->top && !strcmp (m->fi->full_name, m->top)) { + if (m->top && m->fi && !strcmp (m->fi->full_name, m->top)) { if (!(fi = m->fi->child)) fi = m->fi->sibling; } else -- cgit