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

Fixed memory leak in config_load

Browse Source
This commit is contained in:
Markus Makela
2015-04-28 18:43:40 +03:00
parent 74b5e1ddcf
commit bf7576a501
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/core/config.c
View File

@ -209,20 +209,33 @@ int rval;
conn = mysql_init(NULL); conn = mysql_init(NULL);
if (conn) { if (conn) {
if (mysql_real_connect(conn, NULL, NULL, NULL, NULL, 0, NULL, 0)) { if (mysql_real_connect(conn, NULL, NULL, NULL, NULL, 0, NULL, 0)) {
char *ptr; char *ptr,*tmp;
version_string = (char *)mysql_get_server_info(conn);
tmp = (char *)mysql_get_server_info(conn);
unsigned int server_version = mysql_get_server_version(conn); unsigned int server_version = mysql_get_server_version(conn);
ptr = strstr(version_string, "-embedded");
if(version_string)
free(version_string);
if((version_string = malloc(strlen(tmp) + strlen("5.5.5-") + 1)) == NULL)
return 0;
if (server_version >= 100000)
{
strcpy(version_string,"5.5.5-");
strcat(version_string,tmp);
}
else
{
strcpy(version_string,tmp);
}
ptr = strstr(tmp, "-embedded");
if (ptr) { if (ptr) {
*ptr = '\0'; *ptr = '\0';
} }
if (server_version >= 100000)
{
char* tmpstr = malloc(strlen(version_string) + strlen("5.5.5-") + 1);
strcpy(tmpstr,"5.5.5-");
strcat(tmpstr,version_string);
version_string = tmpstr;
}
} }
mysql_close(conn); mysql_close(conn);
} }