[GNUnet-SVN] r37751 - libmicrohttpd/src/microhttpd

[gnunet]

Author: grothoff
Date: 2016-08-22 15:12:28 +0200 (Mon, 22 Aug 2016)
New Revision: 37751

Modified:
   libmicrohttpd/src/microhttpd/memorypool.c
Log:
-avoid calling memmove with NULL argument

Modified: libmicrohttpd/src/microhttpd/memorypool.c
===================================================================
--- libmicrohttpd/src/microhttpd/memorypool.c   2016-08-22 13:09:15 UTC (rev 
37750)
+++ libmicrohttpd/src/microhttpd/memorypool.c   2016-08-22 13:12:28 UTC (rev 
37751)
@@ -241,7 +241,8 @@
     {
       /* fits */
       ret = &pool->memory[pool->pos];
-      memmove (ret, old, old_size);
+      if (0 != old_size)
+        memmove (ret, old, old_size);
       pool->pos += asize;
       return ret;
     }
@@ -273,17 +274,19 @@
     {
       if (keep != pool->memory)
         {
-          memmove (pool->memory,
-                   keep,
-                   copy_bytes);
+          if (0 != copy_bytes)
+            memmove (pool->memory,
+                     keep,
+                     copy_bytes);
           keep = pool->memory;
         }
     }
   pool->end = pool->size;
   /* technically not needed, but safer to zero out */
-  memset (&pool->memory[copy_bytes],
-         0,
-         pool->size - copy_bytes);
+  if (pool->size > copy_bytes)
+    memset (&pool->memory[copy_bytes],
+            0,
+            pool->size - copy_bytes);
   if (NULL != keep)
     pool->pos = ROUND_TO_ALIGN (new_size);
   return keep;