From 100f8ebd663cef7d4a6363f1cdf0bca1215894f9 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 3 Aug 2015 20:02:13 +0300
Subject: [PATCH] Removed unnecessary memory allocation.

---
 server/include/dbusers.h                             |  1 +
 .../modules/routing/readwritesplit/readwritesplit.c  | 12 +++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/server/include/dbusers.h b/server/include/dbusers.h
index e7b94a575..f0367a227 100644
--- a/server/include/dbusers.h
+++ b/server/include/dbusers.h
@@ -47,6 +47,7 @@
 #define MYSQL_PASSWORD_LEN	41
 #define MYSQL_HOST_MAXLEN	60
 #define MYSQL_DATABASE_MAXLEN	128
+#define MYSQL_TABLE_MAXLEN	64
 
 /**
  * MySQL user and host data structure
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 88fd2e58e..3877b49aa 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -1636,7 +1636,8 @@ static skygw_query_type_t is_read_tmp_table(
   bool target_tmp_table = false;
   int tsize = 0, klen = 0,i;
   char** tbl = NULL;
-  char *hkey,*dbname;
+  char *dbname;
+  char hkey[MYSQL_DATABASE_MAXLEN+MYSQL_TABLE_MAXLEN+2];
   MYSQL_session* data;
 
   DCB*               master_dcb     = NULL;
@@ -1664,12 +1665,7 @@ static skygw_query_type_t is_read_tmp_table(
 	  /** Query targets at least one table */
 	  for(i = 0; i<tsize && !target_tmp_table && tbl[i]; i++)
 	    {
-	      klen = strlen(dbname) + strlen(tbl[i]) + 2;
-	      hkey = calloc(klen,sizeof(char));
-	      strcpy(hkey,dbname);
-	      strcat(hkey,".");
-	      strcat(hkey,tbl[i]);
-
+	      sprintf(hkey,"%s.%s",dbname,tbl[i]);
 	      if (rses_prop_tmp && 
 		  rses_prop_tmp->rses_prop_data.temp_tables)
 		{
@@ -1684,8 +1680,6 @@ static skygw_query_type_t is_read_tmp_table(
 					     "Query targets a temporary table: %s",hkey)));
 		    }
 		}
-
-	      free(hkey);
 	    }
 
 	}