Merge 10.5 into 10.6mariadb-10.5.7bb-10.6-georg10.6-vatu

1 files changed, 5 insertions, 2 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 2ad4e131b3f..8507ec7a1eb 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -515,8 +515,11 @@ static inline int my_b_write(IO_CACHE *info, const uchar *Buffer, size_t Count)
   MEM_CHECK_DEFINED(Buffer, Count);
   if (info->write_pos + Count <= info->write_end)
   {
-    memcpy(info->write_pos, Buffer, Count);
-    info->write_pos+= Count;
+    if (Count)
+    {
+      memcpy(info->write_pos, Buffer, Count);
+      info->write_pos+= Count;
+    }
     return 0;
   }
   return _my_b_write(info, Buffer, Count);