diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2020-08-01 10:04:05 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2020-08-01 10:04:05 +0300 |
commit | 9bf6ea3758f5516f2c2b10945ffd345540698225 (patch) | |
tree | bd083b4de6a09e7aa4772ca7d31d62ed208d98a2 | |
parent | c7bb558ee854803736089e56a1742f0ac0643a85 (diff) | |
download | mailutils-9bf6ea3758f5516f2c2b10945ffd345540698225.tar.gz mailutils-9bf6ea3758f5516f2c2b10945ffd345540698225.tar.bz2 |
MIME-related fices in decodemail
* decodemail/decodemail.c (message_decode): Initialize ismime to 0.
* libmailutils/mime/mimehdr.c (parse_param): Silently ignore duplicated
parameters.
-rw-r--r-- | decodemail/decodemail.c | 2 | ||||
-rw-r--r-- | libmailutils/mime/mimehdr.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/decodemail/decodemail.c b/decodemail/decodemail.c index e4d35bf91..319a91651 100644 --- a/decodemail/decodemail.c +++ b/decodemail/decodemail.c @@ -456,7 +456,7 @@ static mu_message_t message_decode (mu_message_t msg, mu_coord_t *crd, size_t dim) { mu_message_t newmsg; - int ismime; + int ismime = 0; int rc; mu_message_is_multipart (msg, &ismime); diff --git a/libmailutils/mime/mimehdr.c b/libmailutils/mime/mimehdr.c index 7d3052f29..5ffc4d028 100644 --- a/libmailutils/mime/mimehdr.c +++ b/libmailutils/mime/mimehdr.c @@ -529,8 +529,17 @@ parse_param (struct mu_wordsplit *ws, size_t *pi, mu_assoc_t assoc, } rc = mu_assoc_install (assoc, key, param); - if (rc) + switch (rc) { + case 0: + break; + + case MU_ERR_EXISTS: + mu_debug (MU_DEBCAT_MIME, MU_DEBUG_ERROR, + ("MIME parameter %s duplicated", key)); + break; + + default: mu_mime_param_free (param); return rc; } |