diff options
author | Colin Percival <cperciva@FreeBSD.org> | 2004-11-18 12:06:51 +0000 |
---|---|---|
committer | Colin Percival <cperciva@FreeBSD.org> | 2004-11-18 12:06:51 +0000 |
commit | 8cca1afc38ca7896c6d1ea46a42b0e2f0d891302 (patch) | |
tree | 22cefaaad5b49eb9763c92892e9bd2f09b3c11e1 | |
parent | 7e5c9a1a2fb5740830ef51f419e27d5f191c92c7 (diff) | |
download | src-releng/5.1.tar.gz src-releng/5.1.zip |
FreeBSD-SA-04:16.fetch:releng/5.1
MFC revision 1.75 of src/usr.bin/fetch/fetch.c
Bump newvers.sh and document in UPDATING.
Approved by: so
Notes
Notes:
svn path=/releng/5.1/; revision=137856
-rw-r--r-- | UPDATING | 4 | ||||
-rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
-rw-r--r-- | usr.bin/fetch/fetch.c | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -13,6 +13,10 @@ 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. +20041118: p18 FreeBSD-SA-04:16.fetch + Correct a buffer overflow in fetch(1) which could allow a + mallicious server to execute arbitrary code on the client. + 20040519: p17 FreeBSD-SA-04:10.cvs Correct a heap overflow in cvs's pserver protocol parser. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index f2204dc7b85a..160e0210dca4 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="5.1" -BRANCH="RELEASE-p17" +BRANCH="RELEASE-p18" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 00bcc7659ba6..e8c9536a5ce3 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -565,7 +565,8 @@ fetch(char *URL, const char *path) /* suck in the data */ signal(SIGINFO, sig_handler); while (!sigint) { - if (us.size != -1 && us.size - count < B_size) + if (us.size != -1 && us.size - count < B_size && + us.size - count >= 0) size = us.size - count; else size = B_size; |