From 529d160079ee9817df9c4ca8fb49ad4304e80169 Mon Sep 17 00:00:00 2001 From: Paul Fox Date: Mon, 1 Dec 2014 08:57:44 -0500 Subject: [PATCH] handle extraneous trailing ';' characters that are followed by whitespace --- uip/mhfixmsg.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index 307aba5a..2c4ef369 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -1885,9 +1885,13 @@ fix_always (CT ct, int *message_mods) { HF hf; for (hf = ct->c_first_hf; hf; hf = hf->next) { - const size_t len = strlen (hf->value); + size_t len = strlen (hf->value); - if (hf->value[len - 1] == '\n' && hf->value[len - 2] == ';') { + /* whitespace following a trailing ';' will be nuked as well */ + if (hf->value[len - 1] == '\n') + while (isspace(hf->value[len - 2])) len--; + + if (hf->value[len - 2] == ';') { /* Remove trailing ';' from parameter value. */ hf->value[len - 2] = '\n'; hf->value[len - 1] = '\0'; @@ -1895,10 +1899,10 @@ fix_always (CT ct, int *message_mods) { /* Also, if Content-Type parameter, remove trailing ';' from ct->c_ctline. This probably isn't necessary but can't hurt. */ - if (strcasecmp (hf->name, "Content-Type") == 0 && - ct->c_ctline && - ct->c_ctline[strlen(ct->c_ctline) - 1] == ';') { - ct->c_ctline[strlen(ct->c_ctline) - 1] = '\0'; + if (strcasecmp(hf->name, "Content-Type") == 0 && ct->c_ctline) { + size_t l = strlen(ct->c_ctline) - 1; + while (isspace(ct->c_ctline[l]) || ct->c_ctline[l] == ';') + ct->c_ctline[l--] = '\0'; } ++*message_mods; -- 2.56.0