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

Add fix for crash if no router options are supplied

Browse Source
This commit is contained in:
Mark Riddoch
2015-02-04 10:26:55 +00:00
parent 23d920c1a9
commit 85a38c9600
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/routing/binlog/blr.c
View File

@ -192,10 +192,12 @@ unsigned char *defuuid;
inst->binlogdir = NULL; inst->binlogdir = NULL;
inst->heartbeat = 300; // Default is every 5 minutes inst->heartbeat = 300; // Default is every 5 minutes
inst->user = strdup(service->credentials.name);
inst->password = strdup(service->credentials.authdata);
my_uuid_init((ulong)rand()*12345,12345); my_uuid_init((ulong)rand()*12345,12345);
if ((defuuid = (char *)malloc(20)) != NULL) if ((defuuid = (char *)malloc(20)) != NULL)
{ {
int i;
my_uuid(defuuid); my_uuid(defuuid);
if ((inst->uuid = (char *)malloc(38)) != NULL) if ((inst->uuid = (char *)malloc(38)) != NULL)
sprintf(inst->uuid, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", sprintf(inst->uuid, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
@ -342,10 +344,16 @@ unsigned char *defuuid;
} }
} }
} }
if (inst->fileroot == NULL) }
inst->fileroot = strdup(BINLOG_NAME_ROOT); else
{
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR, "%s: No router options supplied for binlogrouter",
service->name)));
} }
if (inst->fileroot == NULL)
inst->fileroot = strdup(BINLOG_NAME_ROOT);
inst->active_logs = 0; inst->active_logs = 0;
inst->reconnect_pending = 0; inst->reconnect_pending = 0;
inst->handling_threads = 0; inst->handling_threads = 0;