diff options
| author | Vladimir Dronnikov | 2009-10-17 03:35:10 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2009-10-17 03:35:10 +0200 |
| commit | 8dbe9bba8ef8f12b0ce90042a5b6a1e20fe781bf (patch) | |
| tree | d2ad1921ed22f43fd6a00359aba53a5200cbd81f | |
| parent | 2ace0ad2d7ee52e44dc98feb77bedf5e866e8f11 (diff) | |
| download | busybox-8dbe9bba8ef8f12b0ce90042a5b6a1e20fe781bf.zip busybox-8dbe9bba8ef8f12b0ce90042a5b6a1e20fe781bf.tar.gz | |
sendmail: fix for long headers (by Vladimir)
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | mailutils/sendmail.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c index a216d66..2f99df6 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c @@ -229,10 +229,15 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv) rcptto(sane_address(s+5)); free(s); // N.B. Bcc: vanishes from headers! + // other headers go verbatim - // N.B. we allow MAX_HEADERS generic headers at most to prevent attacks - } else if (strchr(s, ':')) { + + // N.B. RFC2822 2.2.3 "Long Header Fields" allows for headers to occupy several lines. + // Continuation is denoted by prefixing additional lines with whitespace(s). + // Thanks (stefan.seyfried at googlemail.com) for pointing this out. + } else if (strchr(s, ':') || (list && skip_whitespace(s) != s)) { addheader: + // N.B. we allow MAX_HEADERS generic headers at most to prevent attacks if (MAX_HEADERS && ++nheaders >= MAX_HEADERS) goto bail; llist_add_to_end(&list, s); |