Merge from release-1.0beta to Z2

2014-08-15 18:00:39 +03:00
parent cefadaeb75
commit 677a44f497
11 changed files with 277 additions and 103 deletions
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@ -1725,8 +1725,10 @@ static void clientReply (
                                (uint8_t *)GWBUF_DATA((scur->scmd_cur_cmd->my_sescmd_buf));
                        size_t   len = MYSQL_GET_PACKET_LEN(buf);
                        char*    cmdstr = (char *)malloc(len+1);
+                        /** data+termination character == len */
+                        snprintf(cmdstr, len, "%s", &buf[5]);

-                        snprintf(cmdstr, len+1, "%s", &buf[5]);
+                        ss_dassert(len+4 == GWBUF_LENGTH(scur->scmd_cur_cmd->my_sescmd_buf));
                        
                        LOGIF(LE, (skygw_log_write_flush(
                                LOGFILE_ERROR,