diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2003-02-04 18:08:27 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2003-02-04 18:08:27 +0000 |
| commit | 32b03bd58eda7102bb0c663c1c61b4128550a206 (patch) | |
| tree | 1baf8d4b469e09228f7fdb8c90a0800ac1878d08 | |
| parent | 6127c2ded5fb861e2921f5aee1d4109e16d9ad0f (diff) | |
| download | src-test2-32b03bd58eda7102bb0c663c1c61b4128550a206.tar.gz src-test2-32b03bd58eda7102bb0c663c1c61b4128550a206.zip | |
Notes
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | contrib/cvs/src/server.c | 10 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 10 insertions, 6 deletions
@@ -17,6 +17,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. +20030204: p4 FreeBSD-SA-03:01.cvs + Correct a double-free bug and disable a dangerous feature in + cvs. + 20030106: p3 FreeBSD-SA-02:44.filedesc Correct a reference counting bug in fpathconf(2). diff --git a/contrib/cvs/src/server.c b/contrib/cvs/src/server.c index 525d1ce027f6..16210ddaad09 100644 --- a/contrib/cvs/src/server.c +++ b/contrib/cvs/src/server.c @@ -984,9 +984,6 @@ dirswitch (dir, repos) return; } - if (dir_name != NULL) - free (dir_name); - dir_len = strlen (dir); /* Check for a trailing '/'. This is not ISDIRSEP because \ in the @@ -1002,6 +999,9 @@ dirswitch (dir, repos) return; } + if (dir_name != NULL) + free (dir_name); + dir_name = malloc (strlen (server_temp_dir) + dir_len + 40); if (dir_name == NULL) { @@ -4738,8 +4738,8 @@ struct request requests[] = REQ_LINE("Max-dotdot", serve_max_dotdot, 0), REQ_LINE("Static-directory", serve_static_directory, 0), REQ_LINE("Sticky", serve_sticky, 0), - REQ_LINE("Checkin-prog", serve_checkin_prog, 0), - REQ_LINE("Update-prog", serve_update_prog, 0), + REQ_LINE("Checkin-prog", serve_noop, 0), + REQ_LINE("Update-prog", serve_noop, 0), REQ_LINE("Entry", serve_entry, RQ_ESSENTIAL), REQ_LINE("Kopt", serve_kopt, 0), REQ_LINE("Checkin-time", serve_checkin_time, 0), diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index c701e3a4e0fc..f53572c9aacf 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="4.7" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" |