diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-22 13:20:44 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-22 13:20:44 +0200 |
| commit | ca80e14a882b1928350ef0522607cd1011048941 (patch) | |
| tree | 05d992be3d25cf47e38c7bc1ea2dacee485f33c5 /storage | |
| parent | c23d4700e6d9ea4f32eda6965ffc907fa83425e8 (diff) | |
| parent | 1c60f40868f6067be81a50198e1c72df08814adf (diff) | |
| download | mariadb-git-ca80e14a882b1928350ef0522607cd1011048941.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage')
| -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 2bd0cf2fada..8bbd6f2e94a 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -478,7 +478,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 |