summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorInaam Rana <inaam.rana@oracle.com>2012-03-15 12:38:40 -0400
committerInaam Rana <inaam.rana@oracle.com>2012-03-15 12:38:40 -0400
commit04c96834ccf8880529865d6d34c67410af8e33b9 (patch)
treefba032501ee26b98db2d948e21cbe4caf7385543 /storage
parenta8217b7cd3e31c7ff5212b84b9736af689a5ad39 (diff)
downloadmariadb-git-04c96834ccf8880529865d6d34c67410af8e33b9.tar.gz
Bug#13851171 STRING OVERFLOW IN INNODB CODE FOUND BY STATIC ANALYSIS
rb://976 approved by: Marko Makela Add an assertion to ensure that string overflow is not happening. Pointed by Coverity analysis.
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/ChangeLog6
-rw-r--r--storage/innodb_plugin/handler/ha_innodb.cc2
2 files changed, 8 insertions, 0 deletions
diff --git a/storage/innodb_plugin/ChangeLog b/storage/innodb_plugin/ChangeLog
index 416227c84c3..058128a2200 100644
--- a/storage/innodb_plugin/ChangeLog
+++ b/storage/innodb_plugin/ChangeLog
@@ -1,5 +1,11 @@
2012-03-15 The InnoDB Team
+ * handler/ha_innodb.cc:
+ Fix Bug#13851171STRING OVERFLOW IN INNODB CODE FOUND BY STATIC
+ ANALYSIS
+
+2012-03-15 The InnoDB Team
+
* include/sync0rw.ic:
Fix Bug#13537504 VALGRIND: COND. JUMP/MOVE DEPENDS ON
UNINITIALISED VALUES IN OS_THREAD_EQ
diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
index 09094c0146e..f16b9fabd20 100644
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
@@ -6718,6 +6718,8 @@ ha_innobase::create(
DBUG_RETURN(HA_ERR_TO_BIG_ROW);
}
+ ut_a(strlen(name) < sizeof(name2));
+
strcpy(name2, name);
normalize_table_name(norm_name, name2);