diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 9 | ||||
| -rw-r--r-- | camel/camel-folder-summary.c | 7 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-folder.c | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 95abd36ba9..4c3c8045e0 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,12 @@ +2002-09-30 Not Zed <NotZed@Ximian.com> + + * providers/imap/camel-imap-folder.c (imap_get_message): Remove + debug content_info_dump, could cause a crash, and not really + needed anymore. + + * camel-folder-summary.c (camel_content_info_dump): Check ci->type + != NULL before dereferencing it. Should fix crash #31331. + 2002-09-27 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-folder.c (decode_internaldate): New diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index 4eea17751a..09e75b10a5 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -2758,8 +2758,11 @@ camel_content_info_dump (CamelMessageContentInfo *ci, int depth) return; } - printf ("%scontent-type: %s/%s\n", p, ci->type->type ? ci->type->type : "(null)", - ci->type->subtype ? ci->type->subtype : "(null)"); + if (ci->type) + printf ("%scontent-type: %s/%s\n", p, ci->type->type ? ci->type->type : "(null)", + ci->type->subtype ? ci->type->subtype : "(null)"); + else + printf ("%scontent-type: <unset>\n", p); printf ("%scontent-transfer-encoding: %s\n", p, ci->encoding ? ci->encoding : "(null)"); printf ("%scontent-description: %s\n", p, ci->description ? ci->description : "(null)"); printf ("%ssize: %lu\n", p, (unsigned long) ci->size); diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 23800bdefc..33494d975c 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -1957,8 +1957,6 @@ imap_get_message (CamelFolder *folder, const char *uid, CamelException *ex) camel_imap_response_free (store, response); - d(camel_content_info_dump (mi->content, 0)); - if (!mi->content->type) { /* FETCH returned OK, but we didn't parse a BODY * response. Courier will return invalid BODY |