From 474f018ceed329a26a9f3296e334719be9acb781 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Fri, 7 Nov 2014 11:12:26 +0200
Subject: [PATCH] Fixes to minor Coverity errors: 75424 73422 72724 72702 72662

---
 log_manager/test/testorder.c                      | 5 +++--
 query_classifier/test/canonical_tests/canonizer.c | 3 +++
 server/core/config.c                              | 4 ++--
 server/core/gateway.c                             | 6 +++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/log_manager/test/testorder.c b/log_manager/test/testorder.c
index 047e57966..f9bf14213 100644
--- a/log_manager/test/testorder.c
+++ b/log_manager/test/testorder.c
@@ -45,8 +45,9 @@ int main(int argc, char** argv)
   }
   
   block_size = atoi(argv[3]);
-  if(block_size < 1){
-    fprintf(stderr,"Message size too small, must be at least 1 byte long.");
+  if(block_size < 1 || block_size > 1024){
+    fprintf(stderr,"Message size too small or large, must be at least 1 byte long and must not exceed 1024 bytes.");
+	return 1;
   }
 
 
diff --git a/query_classifier/test/canonical_tests/canonizer.c b/query_classifier/test/canonical_tests/canonizer.c
index 223f91f2a..1de287015 100644
--- a/query_classifier/test/canonical_tests/canonizer.c
+++ b/query_classifier/test/canonical_tests/canonizer.c
@@ -57,6 +57,9 @@ int main(int argc, char** argv)
 		{
 			fgets(readbuff,4092,infile);
 			psize = strlen(readbuff);
+			if(psize < 0 || > 4092){
+				continue;
+			}
 			qbuff = gwbuf_alloc(psize + 7);
 			*(qbuff->sbuf->data + 0) = (unsigned char)psize;
 			*(qbuff->sbuf->data + 1) = (unsigned char)(psize>>8);
diff --git a/server/core/config.c b/server/core/config.c
index 4ee39fcb2..1532909d0 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -1268,7 +1268,7 @@ SERVER			*server;
 										(PERCENT_TYPE|COUNT_TYPE));
 							}
 							
-                                                        if (!succp)
+                                                        if (!succp && param != NULL)
                                                         {
                                                                 LOGIF(LM, (skygw_log_write(
                                                                         LOGFILE_MESSAGE,
@@ -1362,7 +1362,7 @@ SERVER			*server;
 						if (enable_root_user && service)
 							serviceEnableRootUser(service, atoi(enable_root_user));
 
-						if (allow_localhost_match_wildcard_host)
+						if (allow_localhost_match_wildcard_host && service)
 							serviceEnableLocalhostMatchWildcardHost(
 								service,
 								atoi(allow_localhost_match_wildcard_host));
diff --git a/server/core/gateway.c b/server/core/gateway.c
index d3f196f86..2c2c11e89 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -1479,7 +1479,11 @@ int main(int argc, char **argv)
 		bool succp;
 
                 sprintf(buf, "%s/log", home_dir);
-                mkdir(buf, 0777);
+				if(mkdir(buf, 0777) != 0){
+					fprintf(stderr,
+							"Error: Cannot create log directory: %s\n",buf);
+					goto return_main;
+				}
                 argv[0] = "MaxScale";
                 argv[1] = "-j";
                 argv[2] = buf;