diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2005-07-06 14:01:52 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2005-07-06 14:01:52 +0000 |
| commit | a00085c1e248b464f31990d6dfd697c9eb4cde20 (patch) | |
| tree | 8f5258911a954cda9542f2ada17fc506539712be | |
| parent | 9c691853ed6471508c1832cfe52d7efa4a8dc458 (diff) | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | lib/libz/inftrees.c | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. Important recent entries: 20040724 (default X changes). +20050706: p4 FreeBSD-SA-05:16.zlib + Correct buffer overflow when handling corrupt deflated data streams. + 20050629: p3 FreeBSD-SA-05:13.ipfw, FreeBSD-SA-05:14.bzip2, FreeBSD-SA-05:15.tcp Correct ipfw packet matching errors with address tables. diff --git a/lib/libz/inftrees.c b/lib/libz/inftrees.c index 4d0b487b4505..36c19153d864 100644 --- a/lib/libz/inftrees.c +++ b/lib/libz/inftrees.c @@ -129,7 +129,7 @@ unsigned short FAR *work; left -= count[len]; if (left < 0) return -1; /* over-subscribed */ } - if (left > 0 && (type == CODES || (codes - count[0] != 1))) + if (left > 0 && (type == CODES || max != 1)) return -1; /* incomplete set */ /* generate offsets into symbol table for each length for sorting */ diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index b1d73e26d4d0..8c99a00fb61a 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="5.4" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" |