diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2003-03-29 19:12:53 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2003-03-29 19:12:53 +0000 |
| commit | 3c5a1e863a66866807948f160122c79d2dd388f5 (patch) | |
| tree | 386651c7612a011fa164c3c96d8196d02de68386 /contrib/sendmail/src/collect.c | |
| parent | 8b739caa56202c57ac3a53e04d5b561d17b20b6c (diff) | |
| download | FreeBSD-src-3c5a1e863a66866807948f160122c79d2dd388f5.zip FreeBSD-src-3c5a1e863a66866807948f160122c79d2dd388f5.tar.gz | |
Import sendmail 8.12.9
Diffstat (limited to 'contrib/sendmail/src/collect.c')
| -rw-r--r-- | contrib/sendmail/src/collect.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/sendmail/src/collect.c b/contrib/sendmail/src/collect.c index 6ebd049..0e50ca0 100644 --- a/contrib/sendmail/src/collect.c +++ b/contrib/sendmail/src/collect.c @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: collect.c,v 8.242.2.3 2002/12/03 17:06:30 gshapiro Exp $") +SM_RCSID("@(#)$Id: collect.c,v 8.242.2.4 2003/03/28 17:34:39 ca Exp $") static void collecttimeout __P((time_t)); static void dferror __P((SM_FILE_T *volatile, char *, ENVELOPE *)); @@ -444,6 +444,7 @@ collect(fp, smtpmode, hdrp, e) OpMode != MD_ARPAFTP)) { + SM_ASSERT(pbp < peekbuf + sizeof(peekbuf)); *pbp++ = c; c = '.'; } @@ -455,11 +456,14 @@ collect(fp, smtpmode, hdrp, e) else { /* push back the ".\rx" */ + SM_ASSERT(pbp < peekbuf + sizeof(peekbuf)); *pbp++ = c; if (OpMode != MD_SMTP && OpMode != MD_DAEMON && OpMode != MD_ARPAFTP) { + SM_ASSERT(pbp < peekbuf + + sizeof(peekbuf)); *pbp++ = '\r'; c = '.'; } @@ -625,6 +629,7 @@ nextstate: } /* trim off trailing CRLF or NL */ + SM_ASSERT(bp > buf); if (*--bp != '\n' || *--bp != '\r') bp++; *bp = '\0'; |
