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 /mysys/my_alloc.c | |
| parent | d5ce7824444b7491f420061076ae5087d4829428 (diff) | |
| parent | 8036d0a3590dddf4d51ba02bc74ba3a5a96674f7 (diff) | |
| download | mariadb-git-c7f322c91faf97a9f758c288b38e1385fd89b32d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysys/my_alloc.c')
| -rw-r--r-- | mysys/my_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 0263283221b..a7d4ec1c248 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -491,7 +491,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; } |