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

Added missing freeing of service resources

Browse Source 
The service resources weren't freed when the service is freed.
This commit is contained in:
Markus Makela
2016-01-15 12:47:51 +02:00
parent a2bc15c870
commit 1656840417
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/core/service.c
View File

@ -142,6 +142,14 @@ service_alloc(const char *servname, const char *router)
service->resources = NULL; service->resources = NULL;
service->localhost_match_wildcard_host = SERVICE_PARAM_UNINIT; service->localhost_match_wildcard_host = SERVICE_PARAM_UNINIT;
service->retry_start = true; service->retry_start = true;
service->weightby = NULL;
service->credentials.authdata = NULL;
service->credentials.name = NULL;
service->version_string = NULL;
service->ctx = NULL;
service->svc_config_param = NULL;
service->users = NULL;
service->routerOptions = NULL;
service->ssl_mode = SSL_DISABLED; service->ssl_mode = SSL_DISABLED;
service->ssl_init_done = false; service->ssl_init_done = false;
service->ssl_ca_cert = NULL; service->ssl_ca_cert = NULL;
@ -654,14 +662,20 @@ service_free(SERVICE *service)
free(service->name); free(service->name);
free(service->routerModule); free(service->routerModule);
if (service->credentials.name) free(service->weightby);
{ free(service->version_string);
free(service->credentials.name); free(service->ssl_key);
} free(service->ssl_cert);
if (service->credentials.authdata) free(service->ssl_ca_cert);
{ free(service->credentials.name);
free(service->credentials.authdata); free(service->credentials.authdata);
}
SSL_CTX_free(service->ctx);
free_config_parameter(service->svc_config_param);
users_free(service->users);
hashtable_free(service->resources);
serviceClearRouterOptions(service);
free(service); free(service);
return 1; return 1;
} }