diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 16:48:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 16:48:37 +0200 |
| commit | 9e840d6898fb3739b441597b9da52c6eba8fe323 (patch) | |
| tree | 73882a74ff5dc6ff56465d7d438479f10939bb4b /mysys/array.c | |
| parent | 03357ded174c13d941abc37e8c12506d75aaa52d (diff) | |
| download | mariadb-git-bb-10.5-MDEV-22387.tar.gz | |
WIP MDEV-22387bb-10.5-MDEV-22387
Diffstat (limited to 'mysys/array.c')
| -rw-r--r-- | mysys/array.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/array.c b/mysys/array.c index 1d1d9dd1c64..59698a4cc7c 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -140,8 +140,9 @@ void *alloc_dynamic(DYNAMIC_ARRAY *array) array->size_of_element, MYF(array->malloc_flags | MY_WME)))) DBUG_RETURN(0); - memcpy(new_ptr, array->buffer, - array->elements * array->size_of_element); + if (array->elements) + memcpy(new_ptr, array->buffer, + array->elements * array->size_of_element); array->malloc_flags&= ~MY_INIT_BUFFER_USED; } else if (!(new_ptr=(char*) |