Bug#17760511: COVERITY ANALYSIS RESULTS AND PATCHES

jhauglid · jhauglid · commit f6159018ea87 · 2013-11-14T16:55:43.000+01:00
Bug#70830:    Coverity analysis results and patches

Fix more issues found by Coverty.

Based on patches contributed by Honza Horak.
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc
@@ -557,7 +557,8 @@ int ReplSemiSyncMaster::reportReplyBinlog(uint32 server_id,
 
   if (need_copy_send_pos)
   {
-    strcpy(reply_file_name_, log_file_name);
+    strncpy(reply_file_name_, log_file_name, sizeof(reply_file_name_) - 1);
+    reply_file_name_[sizeof(reply_file_name_) - 1]= '\0';
     reply_file_pos_ = log_file_pos;
     reply_file_name_inited_ = true;
 
@@ -685,7 +686,8 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
         if (cmp <= 0)
 	{
           /* This thd has a lower position, let's update the minimum info. */
-          strcpy(wait_file_name_, trx_wait_binlog_name);
+          strncpy(wait_file_name_, trx_wait_binlog_name, sizeof(wait_file_name_) - 1);
+          wait_file_name_[sizeof(wait_file_name_) - 1]= '\0';
           wait_file_pos_ = trx_wait_binlog_pos;
 
           rpl_semi_sync_master_wait_pos_backtraverse++;
@@ -696,7 +698,8 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
       }
       else
       {
-        strcpy(wait_file_name_, trx_wait_binlog_name);
+        strncpy(wait_file_name_, trx_wait_binlog_name, sizeof(wait_file_name_) - 1);
+        wait_file_name_[sizeof(wait_file_name_) - 1]= '\0';
         wait_file_pos_ = trx_wait_binlog_pos;
         wait_file_name_inited_ = true;
 
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
@@ -144,7 +144,8 @@ class sp_rcontext : public Sql_alloc
       memcpy(sql_state, _sql_state, SQLSTATE_LENGTH);
       sql_state[SQLSTATE_LENGTH]= '\0';
 
-      strncpy(message, _message, MYSQL_ERRMSG_SIZE);
+      strncpy(message, _message, MYSQL_ERRMSG_SIZE - 1);
+      message[MYSQL_ERRMSG_SIZE - 1]= '\0';
     }
   };
 
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
@@ -1927,7 +1927,7 @@ my_utf32_uni(const CHARSET_INFO *cs __attribute__((unused)),
 {
   if (s + 4 > e)
     return MY_CS_TOOSMALL4;
-  *pwc= (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);
+  *pwc= (((my_wc_t)s[0]) << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);
   return 4;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,8 @@ int ReplSemiSyncMaster::reportReplyBinlog(uint32 server_id,`
`557`	`557`
`558`	`558`	`if (need_copy_send_pos)`
`559`	`559`	`{`
`560`		`- strcpy(reply_file_name_, log_file_name);`
	`560`	`+ strncpy(reply_file_name_, log_file_name, sizeof(reply_file_name_) - 1);`
	`561`	`+ reply_file_name_[sizeof(reply_file_name_) - 1]= '\0';`
`561`	`562`	`reply_file_pos_ = log_file_pos;`
`562`	`563`	`reply_file_name_inited_ = true;`
`563`	`564`
`@@ -685,7 +686,8 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,`
`685`	`686`	`if (cmp <= 0)`
`686`	`687`	`{`
`687`	`688`	`/* This thd has a lower position, let's update the minimum info. */`
`688`		`- strcpy(wait_file_name_, trx_wait_binlog_name);`
	`689`	`+ strncpy(wait_file_name_, trx_wait_binlog_name, sizeof(wait_file_name_) - 1);`
	`690`	`+ wait_file_name_[sizeof(wait_file_name_) - 1]= '\0';`
`689`	`691`	`wait_file_pos_ = trx_wait_binlog_pos;`
`690`	`692`
`691`	`693`	`rpl_semi_sync_master_wait_pos_backtraverse++;`
`@@ -696,7 +698,8 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,`
`696`	`698`	`}`
`697`	`699`	`else`
`698`	`700`	`{`
`699`		`- strcpy(wait_file_name_, trx_wait_binlog_name);`
	`701`	`+ strncpy(wait_file_name_, trx_wait_binlog_name, sizeof(wait_file_name_) - 1);`
	`702`	`+ wait_file_name_[sizeof(wait_file_name_) - 1]= '\0';`
`700`	`703`	`wait_file_pos_ = trx_wait_binlog_pos;`
`701`	`704`	`wait_file_name_inited_ = true;`
`702`	`705`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,8 @@ class sp_rcontext : public Sql_alloc`
`144`	`144`	`memcpy(sql_state, _sql_state, SQLSTATE_LENGTH);`
`145`	`145`	`sql_state[SQLSTATE_LENGTH]= '\0';`
`146`	`146`
`147`		`- strncpy(message, _message, MYSQL_ERRMSG_SIZE);`
	`147`	`+ strncpy(message, _message, MYSQL_ERRMSG_SIZE - 1);`
	`148`	`+ message[MYSQL_ERRMSG_SIZE - 1]= '\0';`
`148`	`149`	`}`
`149`	`150`	`};`
`150`	`151`
Original file line number	Diff line number	Diff line change
`@@ -1927,7 +1927,7 @@ my_utf32_uni(const CHARSET_INFO *cs __attribute__((unused)),`
`1927`	`1927`	`{`
`1928`	`1928`	`if (s + 4 > e)`
`1929`	`1929`	`return MY_CS_TOOSMALL4;`
`1930`		`- *pwc= (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);`
	`1930`	`+ *pwc= (((my_wc_t)s[0]) << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);`
`1931`	`1931`	`return 4;`
`1932`	`1932`	`}`
`1933`	`1933`