From 2b11b53144ed2fb3926e9d2f6218e0a8c2b71ea9 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 12 Nov 2014 17:25:49 +0200 Subject: [PATCH] Fixes to Coverity defects 72681, 72683, 72691. --- server/modules/filter/hint/hintparser.c | 2 +- server/modules/filter/topfilter.c | 4 ++-- server/modules/routing/readwritesplit/readwritesplit.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/modules/filter/hint/hintparser.c b/server/modules/filter/hint/hintparser.c index df0888508..0d0e47dcb 100644 --- a/server/modules/filter/hint/hintparser.c +++ b/server/modules/filter/hint/hintparser.c @@ -435,7 +435,7 @@ HINT_MODE mode = HM_EXECUTE; token_free(tok); } /*< while */ - if (tok->token == TOK_EOL) + if ( tok && tok->token == TOK_EOL) { token_free(tok); } diff --git a/server/modules/filter/topfilter.c b/server/modules/filter/topfilter.c index e4c16b2ba..eaf471910 100644 --- a/server/modules/filter/topfilter.c +++ b/server/modules/filter/topfilter.c @@ -314,10 +314,10 @@ char *remote, *user; else my_session->userName = NULL; my_session->active = 1; - if (my_instance->source && strcmp(my_session->clientHost, + if (my_instance->source && my_session->clientHost && strcmp(my_session->clientHost, my_instance->source)) my_session->active = 0; - if (my_instance->user && strcmp(my_session->userName, + if (my_instance->user && my_session->userName && strcmp(my_session->userName, my_instance->user)) my_session->active = 0; diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c index 6b475a4e9..eca2a5615 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.c +++ b/server/modules/routing/readwritesplit/readwritesplit.c @@ -1540,12 +1540,12 @@ skygw_query_type_t is_read_tmp_table( } } - for(i = 0; i