diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 15:53:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 15:53:38 +0300 |
| commit | c9cf6b13f6f9aaae57efb514e0b0f51e7ea09798 (patch) | |
| tree | 810d8e37f7b3dded1323a79ce43f14603679c0a7 /mysys/my_alloc.c | |
| parent | b795adcff72a84421576748646e2446e3ef24202 (diff) | |
| parent | 33ae1616e01b564d03c507769564d37c582783cf (diff) | |
| download | mariadb-git-c9cf6b13f6f9aaae57efb514e0b0f51e7ea09798.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysys/my_alloc.c')
| -rw-r--r-- | mysys/my_alloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 19de166b1d5..536a3a5f3bc 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -1,5 +1,6 @@ /* Copyright (c) 2000, 2010, Oracle and/or its affiliates + Copyright (c) 2010, 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 @@ -479,7 +480,8 @@ char *strmake_root(MEM_ROOT *root, const char *str, size_t len) char *pos; if ((pos=alloc_root(root,len+1))) { - memcpy(pos,str,len); + if (len) + memcpy(pos,str,len); pos[len]=0; } return pos; |