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

Fixed event names being truncated

Browse Source 
A buffer was allocated for strlen(event) characters leading to the
name always being truncated by one character. The use of a buffer was
unnecessary and was fixed by using the mon_get_event_name function directly.
This commit is contained in:
Markus Makela
2015-11-18 04:35:03 +02:00
parent 521165d20a
commit 86db0f8754
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/monitor_common.c
View File

@ -314,11 +314,9 @@ bool mon_print_fail_status(
void monitor_launch_script(MONITOR* mon, MONITOR_SERVERS* ptr, char* script) void monitor_launch_script(MONITOR* mon, MONITOR_SERVERS* ptr, char* script)
{ {
char nodelist[PATH_MAX + MON_ARG_MAX + 1] = {'\0'}; char nodelist[PATH_MAX + MON_ARG_MAX + 1] = {'\0'};
char event[strlen(mon_get_event_name(ptr))];
char initiator[strlen(ptr->server->name) + 24]; // Extra space for port char initiator[strlen(ptr->server->name) + 24]; // Extra space for port
snprintf(initiator, sizeof(initiator), "%s:%d", ptr->server->name, ptr->server->port); snprintf(initiator, sizeof(initiator), "%s:%d", ptr->server->name, ptr->server->port);
snprintf(event, sizeof(event), "%s", mon_get_event_name(ptr));
mon_append_node_names(mon->databases, nodelist, PATH_MAX + MON_ARG_MAX); mon_append_node_names(mon->databases, nodelist, PATH_MAX + MON_ARG_MAX);
EXTERNCMD* cmd = externcmd_allocate(script); EXTERNCMD* cmd = externcmd_allocate(script);
@ -330,7 +328,7 @@ void monitor_launch_script(MONITOR* mon, MONITOR_SERVERS* ptr, char* script)
} }
externcmd_substitute_arg(cmd, "[$]INITIATOR", initiator); externcmd_substitute_arg(cmd, "[$]INITIATOR", initiator);
externcmd_substitute_arg(cmd, "[$]EVENT", event); externcmd_substitute_arg(cmd, "[$]EVENT", mon_get_event_name(ptr));
externcmd_substitute_arg(cmd, "[$]NODELIST", nodelist); externcmd_substitute_arg(cmd, "[$]NODELIST", nodelist);
if (externcmd_execute(cmd)) if (externcmd_execute(cmd))