diff options
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-folder-summary.c | 7 | ||||
| -rw-r--r-- | camel/camel-mime-utils.c | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index f5f517ff3a..b1eaf0a3fb 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2001-12-12 Jeffrey Stedfast <fejj@ximian.com> + + * camel-folder-summary.c (content_info_load): Don't try setting a + content-type parameter if either the name or value is NULL. + + * camel-mime-utils.c (header_set_param): NULL-protection. + 2002-01-02 Jeffrey Stedfast <fejj@ximian.com> * camel-tcp-stream-ssl.c (ssl_bad_cert): Do more like what mutt diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index 9a97a0bb59..d2b3c9fba6 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -1768,11 +1768,14 @@ content_info_load(CamelFolderSummary *s, FILE *in) g_free(subtype); if (camel_file_util_decode_uint32(in, &count) == -1 || count > 500) goto error; - + for (i=0;i<count;i++) { char *name, *value; camel_folder_summary_decode_token(in, &name); camel_folder_summary_decode_token(in, &value); + if (!(name && value)) + goto error; + header_content_type_set_param(ct, name, value); /* TODO: do this so we dont have to double alloc/free */ g_free(name); @@ -1791,7 +1794,7 @@ content_info_load(CamelFolderSummary *s, FILE *in) if (!ferror(in)) return ci; -error: + error: camel_folder_summary_content_info_free(s, ci); return NULL; } diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index 0834a73814..f00c5d21a8 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -2093,7 +2093,10 @@ struct _header_param * header_set_param (struct _header_param **l, const char *name, const char *value) { struct _header_param *p = (struct _header_param *)l, *pn; - + + if (name == NULL) + return NULL; + while (p->next) { pn = p->next; if (!strcasecmp (pn->name, name)) { |