aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog11
-rw-r--r--camel/camel-folder-summary.c3
-rw-r--r--camel/providers/imap/camel-imap-summary.c6
3 files changed, 16 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index e485d8f443..49871b60e6 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,16 @@
2001-01-17 Jeffrey Stedfast <fejj@ximian.com>
+ * providers/imap/camel-imap-summary.c (message_info_load): Add
+ some g_warnings() to help debug later if I ever get the segfaults
+ I was getting earlier. Can't seem to reproduce them after my
+ previous "fix".
+
+ * camel-folder-summary.c (camel_folder_summary_load): Undid my
+ change here, NotZed said it was wrong and that if it gets a NULL
+ mi then it should abort and not continue.
+
+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
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 8142029a15..147c8e452e 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -537,9 +537,6 @@ camel_folder_summary_load(CamelFolderSummary *s)
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);
}
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index dd77673cad..74a024f760 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -169,11 +169,15 @@ message_info_load (CamelFolderSummary *s, FILE *in)
CamelImapMessageInfo *iinfo;
info = camel_imap_summary_parent->message_info_load (s, in);
- if (!info)
+ if (!info) {
+ g_warning ("eek! encountered a NULL message info!");
return NULL;
+ }
iinfo = (CamelImapMessageInfo *)info;
if (camel_folder_summary_decode_uint32 (in, &iinfo->server_flags) == -1) {
+ /* wouldn't it just be better to default to certain server flags here? */
+ g_warning ("eek! problems decoding server flags!");
camel_folder_summary_info_free (s, info);
return NULL;
}