From 264aa571b88307f136160498e056e482700ae1fd Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 13 Jan 2003 00:09:17 +0000 Subject: [PATCH] Fixes from Stefan Esser - Avoid double free in dir_name - Disable checkin-prog and update-prog --- gnu/dist/cvs/src/server.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/dist/cvs/src/server.c b/gnu/dist/cvs/src/server.c index bb2293f5da3d..2ef1c1ac6ee7 100644 --- a/gnu/dist/cvs/src/server.c +++ b/gnu/dist/cvs/src/server.c @@ -981,9 +981,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 @@ -999,6 +996,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) { @@ -4754,8 +4754,13 @@ 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), +#ifdef notdef REQ_LINE("Checkin-prog", serve_checkin_prog, 0), REQ_LINE("Update-prog", serve_update_prog, 0), +#else + REQ_LINE("Checkin-prog", serve_noop, 0), + REQ_LINE("Update-prog", serve_noop, 0), +#endif REQ_LINE("Entry", serve_entry, RQ_ESSENTIAL), REQ_LINE("Kopt", serve_kopt, 0), REQ_LINE("Checkin-time", serve_checkin_time, 0),