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

Fix array usage with servers

Browse Source 
The server monuser and monpw members were used with the assumption that
they could be NULL. This is no longer true since they were converted to
arrays.

The name member of the server was freed leading to a crash when the server
unit test was run.
This commit is contained in:
Markus Makela 2016-11-10 12:35:21 +02:00
parent aefa5c4c57
commit c08a637564
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/server.c
View File

@ -175,7 +175,6 @@ server_free(SERVER *tofreeserver)
spinlock_release(&server_spin);
/* Clean up session and free the memory */
MXS_FREE(tofreeserver->name);
MXS_FREE(tofreeserver->protocol);
MXS_FREE(tofreeserver->unique_name);
MXS_FREE(tofreeserver->server_string);
@ -1088,7 +1087,7 @@ bool server_serialize(SERVER *server, const char *filename)
dprintf(file, "authenticator_options=%s\n", server->auth_options);
}
if (server->monpw && server->monuser)
if (*server->monpw && *server->monuser)
{
dprintf(file, "monitoruser=%s\n", server->monuser);
dprintf(file, "monitorpw=%s\n", server->monpw);