diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 09:10:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 09:10:03 +0300 |
| commit | 2a93e632b1676b6df3dde150888d6428a57f8399 (patch) | |
| tree | f9eac87b11d4e4666e50ac865aa82cac6f50a852 /sql/sql_string.h | |
| parent | 9aea50616c2d8e067e5ce3efb1152e81877bf931 (diff) | |
| parent | 94a520ddbe39ae97de1135d98699cf2674e6b77e (diff) | |
| download | mariadb-git-2a93e632b1676b6df3dde150888d6428a57f8399.tar.gz | |
Merge 10.1 into 10.2
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 63404587404..512c5537840 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -555,7 +555,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; } |