hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New fix candidate to bug #698, http://bugs.mariadb.com/show_bug.cgi?id=698

Browse Source 
client/test/maxadmin_test.sh: added new cases for testing maxadmin
service.c:dListListeners:fixed NULL-pointer reference
debugcli.h: replaced magic number 80 with constant integer.
cli.c:execute:fixed command buffer overflow
debugcmd.c:convert_arg:restored return value to 0 in case of error
This commit is contained in:
VilhoRaatikka
2015-01-19 17:55:02 +02:00
parent 9c34125a59
commit 5d1f029260
5 changed files with 217 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server/modules/routing/debugcmd.c
View File

@ -666,19 +666,13 @@ SERVICE *service;
case ARG_TYPE_SERVICE:
if (mode == CLIM_USER || (rval = (unsigned long)strtol(arg, NULL, 0)) == 0)
rval = (unsigned long)service_find(arg);
if (rval)
return rval;
else
return 0x1; /*< invalid argument */
return rval;
case ARG_TYPE_SERVER:
if (mode == CLIM_USER || (rval = (unsigned long)strtol(arg, NULL, 0)) == 0)
rval = (unsigned long)server_find_by_unique_name(arg);
if (rval)
return rval;
else
return 0x1; /*< invalid argument */
return rval;
case ARG_TYPE_DBUSERS:
if (mode == CLIM_USER || (rval = (unsigned long)strtol(arg, NULL, 0)) == 0)
{
@ -686,39 +680,30 @@ SERVICE *service;
if (service)
return (unsigned long)(service->users);
else
return 1; /*< invalid argument */
return 0;
}
return rval;
case ARG_TYPE_DCB:
rval = (unsigned long)strtol(arg, NULL, 0);
if (mode == CLIM_USER && dcb_isvalid((DCB *)rval) == 0)
rval = 0x1; /*< invalid argument */
rval = 0;
return rval;
case ARG_TYPE_SESSION:
rval = (unsigned long)strtol(arg, NULL, 0);
if (mode == CLIM_USER && session_isvalid((SESSION *)rval) == 0)
rval = 0;
if (rval)
return rval;
else
return 0x1; /*< invalid argument */
return rval;
case ARG_TYPE_MONITOR:
if (mode == CLIM_USER || (rval = (unsigned long)strtol(arg, NULL, 0)) == 0)
rval = (unsigned long)monitor_find(arg);
if (rval)
return rval;
else
return 0x1; /*< invalid argument */
return rval;
case ARG_TYPE_FILTER:
if (mode == CLIM_USER || (rval = (unsigned long)strtol(arg, NULL, 0)) == 0)
rval = (unsigned long)filter_find(arg);
if (rval)
return rval;
else
return 0x1; /*< invalid argument */
return rval;
case ARG_TYPE_NUMERIC:
{
int i;
@ -906,15 +891,12 @@ bool in_space = false;
break;
case 1:
arg1 = convert_arg(cli->mode, args[2],cmds[i].options[j].arg_types[0]);
if (arg1 == 0x1)
{
if (arg1)
cmds[i].options[j].fn(dcb, arg1);
else
dcb_printf(dcb, "Invalid argument: %s\n",
args[2]);
}
else
{
cmds[i].options[j].fn(dcb, arg1);
}
break;
case 2:
arg1 = convert_arg(cli->mode, args[2],cmds[i].options[j].arg_types[0]);
@ -971,7 +953,7 @@ bool in_space = false;
if (!found)
dcb_printf(dcb,
"Command '%s' not known, type help for a list of available commands\n", args[0]);
memset(cli->cmdbuf, 0, 80);
memset(cli->cmdbuf, 0, cmdbuflen);
return 1;
}