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/mf_iocache.c | |
parent | b795adcff72a84421576748646e2446e3ef24202 (diff) | |
parent | 33ae1616e01b564d03c507769564d37c582783cf (diff) | |
download | mariadb-git-c9cf6b13f6f9aaae57efb514e0b0f51e7ea09798.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysys/mf_iocache.c')
-rw-r--r-- | mysys/mf_iocache.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 51e8fe1a02f..448a2a42390 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates - Copyright (c) 2010, 2015, MariaDB + 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 @@ -814,7 +814,8 @@ int _my_b_cache_read(IO_CACHE *info, uchar *Buffer, size_t Count) info->read_pos=info->buffer+Count; info->read_end=info->buffer+length; info->pos_in_file=pos_in_file; - memcpy(Buffer, info->buffer, Count); + if (Count) + memcpy(Buffer, info->buffer, Count); DBUG_RETURN(0); } @@ -1315,7 +1316,8 @@ static int _my_b_cache_read_r(IO_CACHE *cache, uchar *Buffer, size_t Count) DBUG_RETURN(1); } cnt= (len > Count) ? Count : len; - memcpy(Buffer, cache->read_pos, cnt); + if (cnt) + memcpy(Buffer, cache->read_pos, cnt); Count -= cnt; Buffer+= cnt; left_length+= cnt; |