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

Fixes to Coverity tasks 72734, 72717, 72700

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-01 20:33:17 +02:00
parent 9ccbab1899
commit 10f8d0535a
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/gateway.c
View File

@ -549,6 +549,7 @@ static bool resolve_maxscale_homedir(
if (*p_home_dir != NULL) if (*p_home_dir != NULL)
{ {
log_context = strdup("Command-line argument"); log_context = strdup("Command-line argument");
tmp = NULL;
goto check_home_dir; goto check_home_dir;
} }
/*< /*<
@ -640,7 +641,7 @@ check_home_dir:
fprintf(stderr, fprintf(stderr,
"Using %s as MAXSCALE_HOME = %s\n", "Using %s as MAXSCALE_HOME = %s\n",
log_context, log_context,
tmp); (tmp == NULL ? *p_home_dir : tmp));
} }
} }
} }
@ -648,7 +649,10 @@ check_home_dir:
{ {
succp = false; succp = false;
} }
if (tmp != NULL)
{
free(tmp); free(tmp);
}
if (log_context != NULL) if (log_context != NULL)
{ {

3
server/modules/filter/regexfilter.c
View File

@ -192,6 +192,7 @@ int i, cflags = REG_ICASE;
if (my_instance->match == NULL || my_instance->replace == NULL) if (my_instance->match == NULL || my_instance->replace == NULL)
{ {
free(my_instance);
return NULL; return NULL;
} }
@ -386,6 +387,8 @@ regmatch_t match[10];
free(orig); free(orig);
return NULL; return NULL;
} }
free(orig);
res_size = 2 * length; res_size = 2 * length;
result = (char *)malloc(res_size); result = (char *)malloc(res_size);
res_length = 0; res_length = 0;