diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-01-18 10:03:04 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-01-18 10:03:04 +0800 |
| commit | a37006af0ac5ff13e3825189485d1e5edee1720e (patch) | |
| tree | 69bbdabfb9935548106197cbf40872d5263b357c | |
| parent | 229b57ab1a55e361c74cf6a3b69ae4617d7bf7e3 (diff) | |
| download | gsoc2013-evolution-a37006af0ac5ff13e3825189485d1e5edee1720e.tar.gz gsoc2013-evolution-a37006af0ac5ff13e3825189485d1e5edee1720e.tar.zst gsoc2013-evolution-a37006af0ac5ff13e3825189485d1e5edee1720e.zip | |
Make sure that the message-info is non-null before we go accessing inner
2001-01-17 Jeffrey Stedfast <fejj@ximian.com>
* camel-folder-summary.c (camel_folder_summary_load): Make sure
that the message-info is non-null before we go accessing inner
parts of it and/or adding it to the summary array. I may not have
handled the error correctly, but it does seem to work
correctly. If NotZed could double-check this it'd be great.
svn path=/trunk/; revision=7608
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-folder-summary.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 62a970b36f..e485d8f443 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,11 @@ 2001-01-17 Jeffrey Stedfast <fejj@ximian.com> + * camel-folder-summary.c (camel_folder_summary_load): Make sure + that the message-info is non-null before we go accessing inner + parts of it and/or adding it to the summary array. I may not have + handled the error correctly, but it does seem to work + correctly. If NotZed could double-check this it'd be great. + * providers/smtp/camel-smtp-transport.c (get_smtp_error_string): New smtp error-code to string mapping function. (smtp_connect): Use the new error->string function for reporting diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index 452dc02b77..8142029a15 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -536,7 +536,10 @@ camel_folder_summary_load(CamelFolderSummary *s) /* FIXME: check returns */ for (i=0;i<s->saved_count;i++) { mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_load(s, in); - + + if (!mi) + continue; + if (s->build_content) { mi->content = perform_content_info_load(s, in); } |