diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-21 21:06:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-21 21:06:01 +0200 |
| commit | 8c493a910fd224235b3eddb4bacac0592146cac6 (patch) | |
| tree | 1ba77b09ad11054ae1f6767abc2441fcea54da07 /storage/innobase/dict/dict0mem.cc | |
| parent | e9c494c8438c7fcfe8edd197c9a6919be4a02ab0 (diff) | |
| parent | 925b5030583e3622705621b4a0e56d6ccc3c5fcc (diff) | |
| download | mariadb-git-8c493a910fd224235b3eddb4bacac0592146cac6.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase/dict/dict0mem.cc')
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index c67e581621e..e1714c78036 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -2,7 +2,7 @@ Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2018, MariaDB Corporation. +Copyright (c) 2013, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -320,7 +320,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 |