aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory Neil Shapiro <gshapiro@FreeBSD.org>2003-09-17 20:22:03 +0000
committerGregory Neil Shapiro <gshapiro@FreeBSD.org>2003-09-17 20:22:03 +0000
commit068214ed63f14fb6153542156c7bd38e48cbf632 (patch)
treed432340e90822dcedac071f57b6cca893f55d38d
parentfae992ffd52613b12724a74f84ec4886316abe42 (diff)
downloadsrc-068214ed63f14fb6153542156c7bd38e48cbf632.tar.gz
src-068214ed63f14fb6153542156c7bd38e48cbf632.zip
MFC: sendmail address parsing bug fix
Approved by: so (nectar)
Notes
Notes: svn path=/releng/4.4/; revision=120179
-rw-r--r--UPDATING3
-rw-r--r--contrib/sendmail/src/parseaddr.c4
-rw-r--r--contrib/sendmail/src/version.c2
-rw-r--r--sys/conf/newvers.sh2
4 files changed, 9 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index ab9253edbcc5..f85518baf358 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20030917: p42 FreeBSD-SA-03:13.sendmail
+ Fix another address parsing buffer overflow.
+
20030916: p41 FreeBSD-SA-03:12.openssh
Follow-up fixes for OpenSSH oversized packet buffer handling.
diff --git a/contrib/sendmail/src/parseaddr.c b/contrib/sendmail/src/parseaddr.c
index 0f6bf5953ab9..4176ece83e00 100644
--- a/contrib/sendmail/src/parseaddr.c
+++ b/contrib/sendmail/src/parseaddr.c
@@ -538,7 +538,11 @@ prescan(addr, delim, pvpbuf, pvpbsize, delimptr, toktab)
addr[MAXNAME] = '\0';
returnnull:
if (delimptr != NULL)
+ {
+ if (p > addr)
+ p--;
*delimptr = p;
+ }
CurEnv->e_to = saveto;
return NULL;
}
diff --git a/contrib/sendmail/src/version.c b/contrib/sendmail/src/version.c
index fe2b78aed68c..4493bf6b6cd7 100644
--- a/contrib/sendmail/src/version.c
+++ b/contrib/sendmail/src/version.c
@@ -15,4 +15,4 @@
static char id[] = "@(#)$Id: version.c,v 8.43.4.39 2001/08/20 14:45:34 gshapiro Exp $";
#endif /* ! lint */
-char Version[] = "8.11.6p2";
+char Version[] = "8.11.6p3";
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 882774277586..580f9bef9049 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.4"
-BRANCH="RELEASE-p41"
+BRANCH="RELEASE-p42"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"