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
commit80b97c646ba4a8cccde5037cce46adf575cda630 (patch)
tree5e241f5397c2b88d2ff5f1bfd2dca0c2f61ed9cf
parent4bdd28ca02a581baa4de4b0f914a926685f0d896 (diff)
downloadsrc-80b97c646ba4a8cccde5037cce46adf575cda630.tar.gz
src-80b97c646ba4a8cccde5037cce46adf575cda630.zip
MFC: sendmail address parsing bug fix
Approved by: so (nectar)
Notes
Notes: svn path=/releng/4.6/; 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 73894e44be1c..f439865aba6b 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: p20 FreeBSD-SA-03:13.sendmail
+ Fix another address parsing buffer overflow.
+
20030916: p19 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 9774882ab7d2..9ea850e026f3 100644
--- a/contrib/sendmail/src/parseaddr.c
+++ b/contrib/sendmail/src/parseaddr.c
@@ -700,7 +700,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 83dbfd058992..006b17e0d248 100644
--- a/contrib/sendmail/src/version.c
+++ b/contrib/sendmail/src/version.c
@@ -15,4 +15,4 @@
SM_RCSID("@(#)$Id: version.c,v 8.99 2002/04/04 22:20:06 ca Exp $")
-char Version[] = "8.12.3p2";
+char Version[] = "8.12.3p3";
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index d8205439483a..3bfbdcf513fa 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.6.2"
-BRANCH="RELEASE-p19"
+BRANCH="RELEASE-p20"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"