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

Fixes to Coverity errors:

Browse Source 
72662
72702
72724
73397
73410
73414
73422
75424
75748
75789
75938
75939

Also includes a fix to a bug caused by a previous Coverity error change in canonizer.c
This commit is contained in:
Markus Makela
2014-11-07 11:52:40 +02:00
parent 474f018cee
commit a4caac55c8
5 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
query_classifier/query_classifier.cc
View File

@ -1088,7 +1088,7 @@ char** skygw_get_table_names(GWBUF* querybuf,int* tblsize, bool fullnames)
}
}
if(tmp != NULL){
char *catnm = NULL;
if(fullnames)
@ -1113,6 +1113,7 @@ char** skygw_get_table_names(GWBUF* querybuf,int* tblsize, bool fullnames)
tbl=tbl->next_local;
}
}
lex->current_select = lex->current_select->next_select_in_list();
}

2
query_classifier/test/canonical_tests/canonizer.c
View File

@ -57,7 +57,7 @@ int main(int argc, char** argv)
{
fgets(readbuff,4092,infile);
psize = strlen(readbuff);
if(psize < 0 || > 4092){
if(psize < 0 || psize > 4092){
continue;
}
qbuff = gwbuf_alloc(psize + 7);

2
server/core/config.c
View File

@ -1359,7 +1359,7 @@ SERVER *server;
serviceSetUser(obj->element,
user,
auth);
if (enable_root_user && service)
if (enable_root_user)
serviceEnableRootUser(service, atoi(enable_root_user));
if (allow_localhost_match_wildcard_host && service)

11
server/modules/filter/test/harness_common.c
View File

@ -137,8 +137,8 @@ FILTER_PARAMETER** read_params(int* paramc)
do_read = 0;
}
}
FILTER_PARAMETER** params;
if((params = malloc(sizeof(FILTER_PARAMETER*)*(pc+1)))!=NULL){
FILTER_PARAMETER** params = NULL;
if((params = malloc(sizeof(FILTER_PARAMETER*)*(pc+1))) != NULL){
for(i = 0;i<pc;i++){
params[i] = malloc(sizeof(FILTER_PARAMETER));
if(params[i]){
@ -148,9 +148,9 @@ FILTER_PARAMETER** read_params(int* paramc)
free(names[i]);
free(values[i]);
}
}
params[pc] = NULL;
*paramc = pc;
}
return params;
}
@ -925,8 +925,9 @@ GWBUF* gen_packet(PACKET pkt)
int process_opts(int argc, char** argv)
{
int fd = open_file("harness.cnf",1), buffsize = 1024;
int rd,fsize,rdsz;
unsigned int fd = open_file("harness.cnf",1), buffsize = 1024;
int rd,rdsz;
unsigned int fsize;
char *buff = calloc(buffsize,sizeof(char)), *tok = NULL;
/**Parse 'harness.cnf' file*/

6
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -1425,7 +1425,7 @@ void check_drop_tmp_table(
if (is_drop_table_query(querybuf))
{
tbl = skygw_get_table_names(querybuf,&tsize,false);
if(tbl != NULL){
for(i = 0; i<tsize; i++)
{
klen = strlen(dbname) + strlen(tbl[i]) + 2;
@ -1447,7 +1447,7 @@ void check_drop_tmp_table(
free(tbl[i]);
free(hkey);
}
if(tbl != NULL){
free(tbl);
}
}
@ -1495,7 +1495,7 @@ skygw_query_type_t is_read_tmp_table(
{
tbl = skygw_get_table_names(querybuf,&tsize,false);
if (tsize > 0)
if (tbl != NULL && tsize > 0)
{
/** Query targets at least one table */
for(i = 0; i<tsize && !target_tmp_table && tbl[i]; i++)