Mercurial > dovecot > core-2.2
changeset 21673:e4b2931f3566
lib-mail: Fix message_part_data_is_plain_7bit()
Content-Type parameters weren't handled exactly right.
Broken by recent changes.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Mon, 30 Jan 2017 21:53:01 +0200 |
| parents | ca4fd60f2259 |
| children | 785620a45fc5 |
| files | src/lib-mail/message-part-data.c |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-mail/message-part-data.c Wed Feb 22 13:02:27 2017 +0200 +++ b/src/lib-mail/message-part-data.c Mon Jan 30 21:53:01 2017 +0200 @@ -39,10 +39,12 @@ return FALSE; /* only allowed parameter is charset=us-ascii, which is also default */ - if (data->content_type_params_count > 0 && - (strcasecmp(data->content_type_params[0].name, "charset") != 0 || - strcasecmp(data->content_type_params[0].value, - MESSAGE_PART_DEFAULT_CHARSET) != 0)) + if (data->content_type_params_count == 0) { + /* charset defaults to us-ascii */ + } else if (data->content_type_params_count != 1 || + strcasecmp(data->content_type_params[0].name, "charset") != 0 || + strcasecmp(data->content_type_params[0].value, + MESSAGE_PART_DEFAULT_CHARSET) != 0) return FALSE; if (data->content_id != NULL ||