diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 15:48:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 15:48:47 +0200 |
| commit | c7f322c91faf97a9f758c288b38e1385fd89b32d (patch) | |
| tree | cf2a4cf562acffdf5b4b96d84e34f29c7f428458 /sql/unireg.cc | |
| parent | d5ce7824444b7491f420061076ae5087d4829428 (diff) | |
| parent | 8036d0a3590dddf4d51ba02bc74ba3a5a96674f7 (diff) | |
| download | mariadb-git-c7f322c91faf97a9f758c288b38e1385fd89b32d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index cccb09a9fb9..3e5403ab878 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -1009,8 +1009,11 @@ static bool pack_fields(uchar **buff_arg, List<Create_field> &create_fields, it.rewind(); while ((field=it++)) { - memcpy(buff, field->comment.str, field->comment.length); - buff+= field->comment.length; + if (size_t l= field->comment.length) + { + memcpy(buff, field->comment.str, l); + buff+= l; + } } } *buff_arg= buff; |