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
commita3fd61e4f548f156e9b3750877a3a98a1b7e3fc9 (patch)
tree299a707e649da53223372ae4d081eb8054698bde
parentf7d5f8b345efa323fda1df9d044673e008dabcc5 (diff)
downloadsrc-a3fd61e4f548f156e9b3750877a3a98a1b7e3fc9.tar.gz
src-a3fd61e4f548f156e9b3750877a3a98a1b7e3fc9.zip
MFC: sendmail address parsing bug fix
Approved by: so (nectar)
Notes
Notes: svn path=/releng/4.3/; 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 0590bee92e6c..5436ef6ffadc 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,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: p38 FreeBSD-SA-03:13.sendmail
+ Fix another address parsing buffer overflow.
+
20030916: p37 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 f4cffcf5ef0b..f35378c36c1c 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 88fc22af13b5..47b3ca90aa7c 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.30 2001/02/27 19:22:31 gshapiro Exp $";
#endif /* ! lint */
-char Version[] = "8.11.3p2";
+char Version[] = "8.11.3p3";
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 13d4b27aed69..f8ec3304a08d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.3"
-BRANCH="RELEASE-p37"
+BRANCH="RELEASE-p38"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"