diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2004-08-01 01:04:57 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2004-08-01 01:04:57 +0000 |
| commit | 1fc446a819a244515d9461fa50d34ee191414d6f (patch) | |
| tree | f6477ae85b00ee6d58b086b0d1d597dd9a403391 /contrib/sendmail/src/mime.c | |
| parent | 238623a0204c90e8d61dbde7b3b499a5036f2e5d (diff) | |
| download | FreeBSD-src-1fc446a819a244515d9461fa50d34ee191414d6f.zip FreeBSD-src-1fc446a819a244515d9461fa50d34ee191414d6f.tar.gz | |
Import sendmail 8.13.1
Diffstat (limited to 'contrib/sendmail/src/mime.c')
| -rw-r--r-- | contrib/sendmail/src/mime.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/sendmail/src/mime.c b/contrib/sendmail/src/mime.c index a9a26c4..6f4e782 100644 --- a/contrib/sendmail/src/mime.c +++ b/contrib/sendmail/src/mime.c @@ -14,7 +14,7 @@ #include <sendmail.h> #include <string.h> -SM_RCSID("@(#)$Id: mime.c,v 8.130.2.3 2004/01/08 21:42:56 ca Exp $") +SM_RCSID("@(#)$Id: mime.c,v 8.136 2004/03/22 18:21:34 ca Exp $") /* ** MIME support. @@ -137,7 +137,7 @@ mime8to7(mci, header, e, boundaries, flags) p = hvalue("Content-Transfer-Encoding", header); if (p == NULL || (pvp = prescan(p, '\0', pvpbuf, sizeof pvpbuf, NULL, - MimeTokenTab)) == NULL || + MimeTokenTab, false)) == NULL || pvp[0] == NULL) { cte = NULL; @@ -159,7 +159,7 @@ mime8to7(mci, header, e, boundaries, flags) } if (p != NULL && (pvp = prescan(p, '\0', pvpbuf, sizeof pvpbuf, NULL, - MimeTokenTab)) != NULL && + MimeTokenTab, false)) != NULL && pvp[0] != NULL) { if (tTd(43, 40)) @@ -768,11 +768,11 @@ mime_getchar(fp, boundaries, btp) return SM_IO_EOF; } - atbol = c == '\n'; - if (c != SM_IO_EOF) + if (bp < &buf[sizeof buf - 2] && c != SM_IO_EOF) *bp++ = c; } + atbol = c == '\n'; buflen = bp - buf - 1; if (buflen < 0) { @@ -990,7 +990,7 @@ mime7to8(mci, header, e) p = hvalue("Content-Transfer-Encoding", header); if (p == NULL || (pvp = prescan(p, '\0', pvpbuf, sizeof pvpbuf, NULL, - MimeTokenTab)) == NULL || + MimeTokenTab, false)) == NULL || pvp[0] == NULL) { /* "can't happen" -- upper level should have caught this */ |
