You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2010/08/20 00:35:21 UTC
svn commit: r987339 - /httpd/httpd/trunk/server/main.c
Author: trawick
Date: Thu Aug 19 22:35:21 2010
New Revision: 987339
URL: http://svn.apache.org/viewvc?rev=987339&view=rev
Log:
Fortify complains about an overflow of pad[], which would
require a mongo argv[0]. Get the vprintf formatter to handle
the padding and avoid creating the padding altogether.
Modified:
httpd/httpd/trunk/server/main.c
Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=987339&r1=987338&r2=987339&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Thu Aug 19 22:35:21 2010
@@ -331,37 +331,32 @@ static process_rec *init_process(int *ar
static void usage(process_rec *process)
{
const char *bin = process->argv[0];
- char pad[MAX_STRING_LEN];
- unsigned i;
-
- for (i = 0; i < strlen(bin); i++) {
- pad[i] = ' ';
- }
-
- pad[i] = '\0';
+ int pad_len = strlen(bin);
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"Usage: %s [-D name] [-d directory] [-f file]", bin);
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " %s [-C \"directive\"] [-c \"directive\"]", pad);
+ " %*s [-C \"directive\"] [-c \"directive\"]", pad_len, " ");
#ifdef WIN32
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " %s [-w] [-k start|restart|stop|shutdown] [-n service_name]", pad);
+ " %*s [-w] [-k start|restart|stop|shutdown] [-n service_name]",
+ pad_len, " ");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " %s [-k install|config|uninstall] [-n service_name]",
- pad);
+ " %*s [-k install|config|uninstall] [-n service_name]",
+ pad_len, " ");
#else
/* XXX not all MPMs support signalling the server in general or graceful-stop
* in particular
*/
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " %s [-k start|restart|graceful|graceful-stop|stop]",
- pad);
+ " %*s [-k start|restart|graceful|graceful-stop|stop]",
+ pad_len, " ");
#endif
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " %s [-v] [-V] [-h] [-l] [-L] [-t] [-T] [-S] [-X]", pad);
+ " %*s [-v] [-V] [-h] [-l] [-L] [-t] [-T] [-S] [-X]",
+ pad_len, " ");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"Options:");