summaryrefslogtreecommitdiff
path: root/mysys/my_alloc.c
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-30 16:48:37 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-30 16:48:37 +0200
commit9e840d6898fb3739b441597b9da52c6eba8fe323 (patch)
tree73882a74ff5dc6ff56465d7d438479f10939bb4b /mysys/my_alloc.c
parent03357ded174c13d941abc37e8c12506d75aaa52d (diff)
downloadmariadb-git-bb-10.5-MDEV-22387.tar.gz
WIP MDEV-22387bb-10.5-MDEV-22387
Diffstat (limited to 'mysys/my_alloc.c')
-rw-r--r--mysys/my_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index d7e62726b22..edcb4ce7483 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -477,7 +477,7 @@ char *strmake_root(MEM_ROOT *root, const char *str, size_t len)
void *memdup_root(MEM_ROOT *root, const void *str, size_t len)
{
char *pos;
- if ((pos=alloc_root(root,len)))
+ if ((pos=alloc_root(root,len)) && len)
memcpy(pos,str,len);
return pos;
}