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

Service users are set to NULL after they are freed.

Browse Source
This commit is contained in:
Markus Makela
2015-11-11 17:10:16 +02:00
parent c5c416e7fe
commit 264944ff23
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/service.c
View File

@ -348,6 +348,7 @@ GWPROTOCOL *funcs;
{ {
users_free(service->users); users_free(service->users);
dcb_close(port->listener); dcb_close(port->listener);
service->users = NULL;
port->listener = NULL; port->listener = NULL;
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
@ -382,8 +383,9 @@ GWPROTOCOL *funcs;
service->name))); service->name)));
users_free(service->users); users_free(service->users);
dcb_close(port->listener); dcb_close(port->listener);
port->listener = NULL; port->listener = NULL;
service->users = NULL;
goto retblock; goto retblock;
} }
} }
@ -396,6 +398,7 @@ GWPROTOCOL *funcs;
port->protocol, port->protocol,
service->name))); service->name)));
users_free(service->users); users_free(service->users);
service->users = NULL;
dcb_close(port->listener); dcb_close(port->listener);
port->listener = NULL; port->listener = NULL;
} }

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

@ -579,6 +579,7 @@ char task_name[BLRM_TASK_NAME_LEN+1] = "";
inst->service->name))); inst->service->name)));
if (service->users) { if (service->users) {
users_free(service->users); users_free(service->users);
service->users = NULL;
} }
free(inst); free(inst);
@ -657,6 +658,7 @@ char task_name[BLRM_TASK_NAME_LEN+1] = "";
if (service->users) { if (service->users) {
users_free(service->users); users_free(service->users);
service->users = NULL;
} }
if (service->dbref && service->dbref->server) { if (service->dbref && service->dbref->server) {

2
server/modules/routing/maxinfo/maxinfo.c
View File

@ -786,7 +786,7 @@ maxinfo_add_mysql_user(SERVICE *service) {
"maxinfo: create hex_sha1_sha1_password failed for service user %s", "maxinfo: create hex_sha1_sha1_password failed for service user %s",
service_user))); service_user)));
users_free(service->users); users_free(service->users);
service->users = NULL;
return 1; return 1;
} }