1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#12929345 : Execution aborts without any messages (Windows only)

Browse Source 
This patch corrects an unsafe string concatenation for a Windows-specific
code segment. The symptoms were, under certain conditions like specifying
the location of my-print-defaults and the basedir, and run on a release
build, the client would exit without printing any messages.
This commit is contained in:
Chuck Bell 2011-09-07 13:09:27 -04:00
parent a2dd614820
commit 5acc7cacae
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/mysql_plugin.c
View File

@ -846,12 +846,19 @@ static int process_options(int argc, char *argv[], char *operation)
{ {
i= (int)strlength(opt_basedir); i= (int)strlength(opt_basedir);
if (opt_basedir[i-1] != FN_LIBCHAR || opt_basedir[i-1] != FN_LIBCHAR2) if (opt_basedir[i-1] != FN_LIBCHAR || opt_basedir[i-1] != FN_LIBCHAR2)
{
char buff[FN_REFLEN];
strncpy(buff, opt_basedir, sizeof(buff) - 1);
#ifdef __WIN__ #ifdef __WIN__
if (opt_basedir[i-1] != '/') strncat(buff, "/", sizeof(buff) - 1);
strcat(opt_basedir, "//");
#else #else
strcat(opt_basedir, FN_DIRSEP); strncat(buff, FN_DIRSEP, sizeof(buff) - 1);
#endif #endif
buff[sizeof(buff) - 1]= 0;
my_delete(opt_basedir, MYF(0));
opt_basedir= my_strdup(buff, MYF(MY_FAE));
}
} }
/* /*