Merge branch '2.1' into develop

include/maxscale/filter.hh

@@ -220,7 +220,7 @@ public:
     static MXS_FILTER_SESSION* newSession(MXS_FILTER* pInstance, MXS_SESSION* pSession)
     {
         FilterType* pFilter = static_cast<FilterType*>(pInstance);
-        FilterSessionType* pFilterSession;
+        FilterSessionType* pFilterSession = NULL;
 
         MXS_EXCEPTION_GUARD(pFilterSession = pFilter->newSession(pSession));
 

query_classifier/qc_sqlite/qc_sqlite.cc

@@ -4259,7 +4259,7 @@ static int32_t qc_sqlite_process_init(void)
         {
             if (this_unit.log_level != QC_LOG_NOTHING)
             {
-                const char* message;
+                const char* message = NULL;
 
                 switch (this_unit.log_level)
                 {

server/core/buffer.cc

@@ -546,8 +546,8 @@ int gwbuf_compare(const GWBUF* lhs, const GWBUF* rhs)
 
             while ((rv == 0) && (i < llen))
             {
-                uint8_t lc;
-                uint8_t rc;
+                uint8_t lc = 0;
+                uint8_t rc = 0;
 
                 ss_debug(bool rv1 = ) gwbuf_get_byte(&lhs, &loffset, &lc);
                 ss_debug(bool rv2 = ) gwbuf_get_byte(&rhs, &roffset, &rc);

server/core/externcmd.cc

@@ -37,7 +37,7 @@ int tokenize_arguments(char* argstr, char** argv)
     bool escaped = false;
     char *ptr, *start;
     char args[strlen(argstr) + 1];
-    char qc;
+    char qc = 0;
 
     strcpy(args, argstr);
     start = args;

server/core/log_manager.cc

@@ -755,11 +755,11 @@ static int logmanager_write_log(int            priority,
                                 size_t         str_len,
                                 const char*    str)
 {
-    logfile_t*   lf;
-    char*        wp;
+    logfile_t*   lf = NULL;
+    char*        wp = NULL;
     int          err = 0;
-    blockbuf_t*  bb;
-    blockbuf_t*  bb_c;
+    blockbuf_t*  bb = NULL;
+    blockbuf_t*  bb_c = NULL;
     size_t       timestamp_len;
     int          i;
 

server/core/modutil.cc

@@ -762,7 +762,7 @@ char* strnchr_esc(char* ptr, char c, int len)
     char* p = (char*)ptr;
     char* start = p;
     bool quoted = false, escaped = false;
-    char qc;
+    char qc = 0;
 
     while (p < start + len)
     {
@@ -808,7 +808,7 @@ char* strnchr_esc_mysql(char* ptr, char c, int len)
     char* p = (char*) ptr;
     char* start = p, *end = start + len;
     bool quoted = false, escaped = false, backtick = false, comment = false;
-    char qc;
+    char qc = 0;
 
     while (p < end)
     {

server/core/server.cc

@@ -933,9 +933,9 @@ serverRowCallback(RESULTSET *set, void *data)
 {
     int *rowno = (int *)data;
     int i = 0;
-    char *stat, buf[20];
-    RESULT_ROW *row;
-    SERVER *server;
+    char *stat = NULL, buf[20];
+    RESULT_ROW *row = NULL;
+    SERVER *server = NULL;
 
     spinlock_acquire(&server_spin);
     server = allServers;

server/core/service.cc

@@ -1237,8 +1237,8 @@ void service_set_retry_interval(SERVICE *service, int value)
 bool
 serviceSetFilters(SERVICE *service, char *filters)
 {
-    MXS_FILTER_DEF **flist;
-    char *ptr, *brkt;
+    MXS_FILTER_DEF **flist = NULL;
+    char *ptr = NULL, *brkt = NULL;
     int n = 0;
     bool rval = true;
     uint64_t capabilities = 0;

server/core/utils.cc

@@ -989,7 +989,7 @@ int open_network_socket(enum mxs_socket_type type, struct sockaddr_storage *addr
 {
     ss_dassert(type == MXS_SOCKET_NETWORK || type == MXS_SOCKET_LISTENER);
     struct addrinfo *ai = NULL, hint = {};
-    int so, rc;
+    int so = 0, rc = 0;
     hint.ai_socktype = SOCK_STREAM;
     hint.ai_family = AF_UNSPEC;
     hint.ai_flags = AI_ALL;

server/modules/filter/cache/rules.cc

@@ -594,11 +594,11 @@ static CACHE_RULE *cache_rule_create_simple_user(cache_rule_attribute_t attribut
                                                  const char            *cvalue,
                                                  uint32_t               debug)
 {
+    CACHE_RULE *rule = NULL;
+
     ss_dassert(attribute == CACHE_ATTRIBUTE_USER);
     ss_dassert((op == CACHE_OP_EQ) || (op == CACHE_OP_NEQ));
 
-    CACHE_RULE *rule = NULL;
-
     bool error = false;
     size_t len = strlen(cvalue);
 
@@ -909,7 +909,7 @@ static CACHE_RULE *cache_rule_create_simple(cache_rule_attribute_t attribute,
 {
     ss_dassert((op == CACHE_OP_EQ) || (op == CACHE_OP_NEQ));
 
-    CACHE_RULE *rule;
+    CACHE_RULE *rule = NULL;
 
     switch (attribute)
     {
@@ -1524,7 +1524,7 @@ static bool cache_rule_matches_table_regexp(CACHE_RULE *self,
     bool matches = false;
 
     int n;
-    char **names;
+    char **names = NULL;
     bool fullnames;
 
     fullnames = true;
@@ -1610,7 +1610,7 @@ static bool cache_rule_matches_table_simple(CACHE_RULE *self, const char *defaul
     }
 
     int n;
-    char **names;
+    char **names = NULL;
 
     names = qc_get_table_names((GWBUF*)query, &n, fullnames);
 

server/modules/filter/dbfwfilter/dbfwfilter.c

@@ -1036,7 +1036,7 @@ char* get_regex_string(char** saved)
 {
     char *start = NULL, *ptr = *saved;
     bool escaped = false, quoted = false;
-    char delimiter;
+    char delimiter = 0;
     while (*ptr != '\0')
     {
         if (!escaped)

server/modules/routing/debugcli/debugcmd.c

@@ -1760,7 +1760,7 @@ static struct
 static unsigned long
 convert_arg(char *arg, int arg_type)
 {
-    unsigned long rval;
+    unsigned long rval = 0;
 
     switch (arg_type)
     {