diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-22 11:15:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-22 11:15:21 +0200 |
| commit | 031fa8f1d260cd9fae67a307d901bd4432bdf1cb (patch) | |
| tree | 36c96ba92e2f345dd26cc8ebe521dde1906ad384 /storage/innobase/dict/dict0mem.cc | |
| parent | 1caec9c8982a73f3db78fabc570934b837658109 (diff) | |
| parent | 8be02be08bf6a7227e2ab6a5443b63f3a155e2a9 (diff) | |
| download | mariadb-git-031fa8f1d260cd9fae67a307d901bd4432bdf1cb.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/dict/dict0mem.cc')
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index c9988997801..7fc8ab79395 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -448,7 +448,8 @@ dict_mem_table_col_rename_low( ut_ad(to_len <= NAME_LEN); char from[NAME_LEN + 1]; - strncpy(from, s, NAME_LEN + 1); + strncpy(from, s, sizeof from - 1); + from[sizeof from - 1] = '\0'; if (from_len == to_len) { /* The easy case: simply replace the column name in |