diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 13:53:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 13:53:10 +0200 |
| commit | 03357ded174c13d941abc37e8c12506d75aaa52d (patch) | |
| tree | 78aa972b05b2eec7ffaa720cbe10c0751cfecc92 /sql/sql_string.h | |
| parent | 066773e2f0fec428713fff25091ecb27922b9d52 (diff) | |
| parent | 1fddccf676e213f94923f5efaaa76d9793b19a89 (diff) | |
| download | mariadb-git-03357ded174c13d941abc37e8c12506d75aaa52d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index d1378e62a97..b3eca118b63 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -314,7 +314,8 @@ public: } void q_append(const char *data, size_t data_len) { - memcpy(Ptr + str_length, data, data_len); + if (data_len) + memcpy(Ptr + str_length, data, data_len); DBUG_ASSERT(str_length <= UINT_MAX32 - data_len); str_length += (uint)data_len; } |