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

Updated user relaod rate refresh and added checks for failed strdup

Browse Source
This commit is contained in:
Mark Riddoch
2014-11-06 09:53:05 +00:00
parent f44ed2f3b4
commit 897fc3f117
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/core/service.c
View File

@ -122,6 +122,13 @@ SERVICE *service;
} }
service->name = strdup(servname); service->name = strdup(servname);
service->routerModule = strdup(router); service->routerModule = strdup(router);
if (service->name == NULL || service->routerModule == NULL)
{
if (service->name)
free(service->name);
free(service);
return NULL;
}
service->version_string = NULL; service->version_string = NULL;
memset(&service->stats, 0, sizeof(SERVICE_STATS)); memset(&service->stats, 0, sizeof(SERVICE_STATS));
service->ports = NULL; service->ports = NULL;
@ -1054,8 +1061,8 @@ int service_refresh_users(SERVICE *service) {
if ( (time(NULL) < (service->rate_limit.last + USERS_REFRESH_TIME)) || (service->rate_limit.nloads > USERS_REFRESH_MAX_PER_TIME)) { if ( (time(NULL) < (service->rate_limit.last + USERS_REFRESH_TIME)) || (service->rate_limit.nloads > USERS_REFRESH_MAX_PER_TIME)) {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [service_refresh_users] refresh rate limit exceeded loading new users' table", "Refresh rate limit exceeded for load of users' table for service '%s'.",
pthread_self()))); service->name)));
spinlock_release(&service->users_table_spin); spinlock_release(&service->users_table_spin);
return 1; return 1;