Commit b7478b96 authored by Chuck Bell's avatar Chuck Bell

BUG#12929631 : Execute crashes with --verbose output (Windows)

This patch corrects an unsafe string concatenation in the Windows
specific code for building the bootstrap command to enable or
disable the plugin. 
parent b5c334ef
...@@ -1157,10 +1157,11 @@ static int bootstrap_server(char *server_path, char *bootstrap_file) ...@@ -1157,10 +1157,11 @@ static int bootstrap_server(char *server_path, char *bootstrap_file)
#ifdef __WIN__ #ifdef __WIN__
char *format_str= 0; char *format_str= 0;
char *verbose_str= ""; const char *verbose_str= NULL;
if (opt_verbose) if (opt_verbose)
strcat(verbose_str, "--console"); verbose_str= "--console";
if (has_spaces(opt_datadir) || has_spaces(opt_basedir) || if (has_spaces(opt_datadir) || has_spaces(opt_basedir) ||
has_spaces(bootstrap_file)) has_spaces(bootstrap_file))
format_str= "\"%s %s --bootstrap --datadir=%s --basedir=%s < %s\""; format_str= "\"%s %s --bootstrap --datadir=%s --basedir=%s < %s\"";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment