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/sql_string.cc | |
parent | d5ce7824444b7491f420061076ae5087d4829428 (diff) | |
parent | 8036d0a3590dddf4d51ba02bc74ba3a5a96674f7 (diff) | |
download | mariadb-git-c7f322c91faf97a9f758c288b38e1385fd89b32d.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r-- | sql/sql_string.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index a5d1f62688d..2b40a72edf3 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2016, MariaDB + Copyright (c) 2016, 2020, MariaDB 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 @@ -229,8 +229,8 @@ bool String::copy(const String &str) { if (alloc(str.str_length)) return TRUE; - str_length=str.str_length; - bmove(Ptr,str.Ptr,str_length); // May be overlapping + if ((str_length=str.str_length)) + bmove(Ptr,str.Ptr,str_length); // May be overlapping Ptr[str_length]=0; str_charset=str.str_charset; return FALSE; @@ -593,8 +593,11 @@ bool String::append_ulonglong(ulonglong val) bool String::append(const char *s, size_t arg_length, CHARSET_INFO *cs) { + if (!arg_length) + return false; + uint32 offset; - + if (needs_conversion((uint32)arg_length, cs, str_charset, &offset)) { size_t add_length; |