X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/049d2ca3c61c78bba9e483c273e52d41c62ba019..8186ba3712898c3c0dfa1e23c9e85a9a2b50bb87:/uip/mhparse.c diff --git a/uip/mhparse.c b/uip/mhparse.c index 51db33ff..943e4233 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -838,7 +838,7 @@ magic_skip: if (ct->c_dispo_type && !get_param(ct->c_dispo_first, "filename", '_', 1)) { add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", - r1bindex(ci->ci_magic, '/')); + r1bindex(ci->ci_magic, '/'), 0); } } else @@ -3255,6 +3255,7 @@ parse_header_attrs (const char *filename, const char *fieldname, struct sectlist { char *value; int index; + int len; struct sectlist *next; } *sp, *sp2; struct parmlist { @@ -3263,11 +3264,11 @@ parse_header_attrs (const char *filename, const char *fieldname, char *lang; struct sectlist *sechead; struct parmlist *next; - } *pp, *phead = NULL; + } *pp, *pp2, *phead = NULL; while (*cp == ';') { char *dp, *vp, *up, *nameptr, *valptr, *charset = NULL, *lang = NULL; - int encoded = 0, partial = 0, index = 0, len = 0; + int encoded = 0, partial = 0, len = 0, index = 0; cp++; while (isspace ((unsigned char) *cp)) @@ -3357,7 +3358,8 @@ parse_header_attrs (const char *filename, const char *fieldname, */ if (index == 0) { vp = dp; - while (*vp != '\'' && !isspace((unsigned char) *vp)) + while (*vp != '\'' && !isspace((unsigned char) *vp) && + *vp != '\0') vp++; if (*vp == '\'') { if (vp != dp) { @@ -3368,6 +3370,7 @@ parse_header_attrs (const char *filename, const char *fieldname, } else { charset = NULL; } + vp++; } else { advise(NULL, "missing charset in message %s's %s: " "field\n%*s(parameter %s)", filename, fieldname, @@ -3375,29 +3378,33 @@ parse_header_attrs (const char *filename, const char *fieldname, free(nameptr); return NOTOK; } - } + dp = vp; - vp = (dp = vp); - while (*vp != '\'' && !isspace((unsigned char) *vp)) - vp++; + while (*vp != '\'' && !isspace((unsigned char) *vp) && + *vp != '\0') + vp++; - if (*vp == '\'') { - if (vp != dp) { - len = vp - dp; - lang = mh_xmalloc(len + 1); - strncpy(lang, dp, len); - lang[len] = '\0'; + if (*vp == '\'') { + if (vp != dp) { + len = vp - dp; + lang = mh_xmalloc(len + 1); + strncpy(lang, dp, len); + lang[len] = '\0'; + } else { + lang = NULL; + } + vp++; } else { - charset = NULL; + advise(NULL, "missing language tag in message %s's %s: " + "field\n%*s(parameter %s)", filename, fieldname, + strlen(invo_name) + 2, "", nameptr); + free(nameptr); + if (charset) + free(charset); + return NOTOK; } - } else { - advise(NULL, "missing language tag in message %s's %s: " - "field\n%*s(parameter %s)", filename, fieldname, - strlen(invo_name) + 2, "", nameptr); - free(nameptr); - if (charset) - free(charset); - return NOTOK; + + dp = vp; } /* @@ -3407,8 +3414,7 @@ parse_header_attrs (const char *filename, const char *fieldname, * length so we can allocate the correct buffer size. */ - for (dp = vp, len = 0; *vp != '\0' && !isspace((unsigned char) *vp); - vp++) { + for (vp = dp, len = 0; istoken(*vp); vp++) { if (*vp == '%') { if (*(vp + 1) == '\0' || !isxdigit((unsigned char) *(vp + 1)) || @@ -3432,7 +3438,7 @@ parse_header_attrs (const char *filename, const char *fieldname, up = valptr = mh_xmalloc(len + 1); - for (vp = dp; *vp != '\0' && !isspace((unsigned char) *vp); vp++) { + for (vp = dp; istoken(*vp); vp++) { if (*vp == '%') { *up++ = decode_qp(*(vp + 1), *(vp + 2)); vp += 2; @@ -3442,6 +3448,7 @@ parse_header_attrs (const char *filename, const char *fieldname, } *up = '\0'; + cp = vp; } else { /* * A "normal" string. If it's got a leading quote, then we @@ -3539,6 +3546,7 @@ bad_quote: memset(sp, 0, sizeof(*sp)); sp->value = valptr; sp->index = index; + sp->len = len; if (pp->sechead == NULL || pp->sechead->index > index) { sp->next = pp->sechead; @@ -3553,7 +3561,7 @@ bad_quote: return NOTOK; } if (sp2->index < sp->index && - (sp2->next == NULL || sp2->next->index < sp->index)) { + (sp2->next == NULL || sp2->next->index > sp->index)) { sp->next = sp2->next; sp2->next = sp; break; @@ -3562,7 +3570,7 @@ bad_quote: if (sp2 == NULL) { advise(NULL, "Internal error: cannot insert partial " - "param in message %s's %s: field\n*s(parameter %s)", + "param in message %s's %s: field\n%*s(parameter %s)", filename, fieldname, strlen(invo_name) + 2, "", nameptr); return NOTOK; @@ -3582,9 +3590,7 @@ bad_quote: pp->lang = lang; } } else { - pm = add_param(param_head, param_tail, nameptr, valptr); - free(nameptr); - free(valptr); + pm = add_param(param_head, param_tail, nameptr, valptr, 1); pm->pm_charset = charset; pm->pm_lang = lang; } @@ -3598,6 +3604,45 @@ bad_quote: } } + /* + * Now that we're done, reassemble all of the partial parameters. + */ + + for (pp = phead; pp != NULL; ) { + char *p, *q; + size_t tlen = 0; + int pindex = 0; + for (sp = pp->sechead; sp != NULL; sp = sp->next) { + if (sp->index != pindex++) { + advise(NULL, "missing section %d for parameter in " + "message %s's %s: field\n%*s(parameter %s)", pindex - 1, + filename, fieldname, strlen(invo_name) + 2, "", + pp->name); + return NOTOK; + } + tlen += sp->len; + } + + p = q = mh_xmalloc(tlen + 1); + for (sp = pp->sechead; sp != NULL; ) { + memcpy(q, sp->value, sp->len); + q += sp->len; + free(sp->value); + sp2 = sp->next; + free(sp); + sp = sp2; + } + + p[tlen] = '\0'; + + pm = add_param(param_head, param_tail, pp->name, p, 1); + pm->pm_charset = pp->charset; + pm->pm_lang = pp->lang; + pp2 = pp->next; + free(pp); + pp = pp2; + } + *header_attrp = cp; return OK; } @@ -4009,14 +4054,14 @@ normal_param(PM pm, char *output, size_t len, size_t valuelen, */ PM -add_param(PM *first, PM *last, const char *name, const char *value) +add_param(PM *first, PM *last, char *name, char *value, int nocopy) { PM pm = mh_xmalloc(sizeof(*pm)); memset(pm, 0, sizeof(*pm)); - pm->pm_name = getcpy(name); - pm->pm_value = getcpy(value); + pm->pm_name = nocopy ? name : getcpy(name); + pm->pm_value = nocopy ? value : getcpy(value); if (*first) { (*last)->pm_next = pm;