diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-12-11 07:51:12 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-12-11 07:51:12 +0800 |
| commit | 95fc38d6d8425f8096d585650d487eae78a5faaf (patch) | |
| tree | d02af046d5980f7d6282b2ac669b0e01df7298ca | |
| parent | b3fb35cd87d3e699549478e4ba79958a46a762ab (diff) | |
| download | gsoc2013-evolution-95fc38d6d8425f8096d585650d487eae78a5faaf.tar.gz gsoc2013-evolution-95fc38d6d8425f8096d585650d487eae78a5faaf.tar.zst gsoc2013-evolution-95fc38d6d8425f8096d585650d487eae78a5faaf.zip | |
check m->fi != NULL before dereferencing it.
2003-12-10 Not Zed <NotZed@Ximian.com>
* em-folder-tree.c (em_folder_tree_get_folder_info__got): check
m->fi != NULL before dereferencing it.
svn path=/trunk/; revision=23916
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 01232494d7..310042ee0e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -31,6 +31,11 @@ 2003-12-10 Not Zed <NotZed@Ximian.com> + * em-folder-tree.c (em_folder_tree_get_folder_info__got): check + m->fi != NULL before dereferencing it. + +2003-12-10 Not Zed <NotZed@Ximian.com> + * em-format-html-display.c (efhd_multipart_signed): * em-format-html.c (efh_multipart_signed): * em-format.c (emf_multipart_signed): treat 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 |