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

[gnunet]

Author: Karlson2k
Date: 2015-01-25 09:04:22 +0100 (Sun, 25 Jan 2015)
New Revision: 34984

Modified:
   libmicrohttpd/src/microhttpd/memorypool.c
Log:
memorypool.c: prevent coping of uninitialized memory in MHD_pool_reset()

Modified: libmicrohttpd/src/microhttpd/memorypool.c
===================================================================
--- libmicrohttpd/src/microhttpd/memorypool.c   2015-01-24 23:28:16 UTC (rev 
34983)
+++ libmicrohttpd/src/microhttpd/memorypool.c   2015-01-25 08:04:22 UTC (rev 
34984)
@@ -263,7 +263,6 @@
                void *keep,
                size_t size)
 {
-  size = ROUND_TO_ALIGN (size);
   if (NULL != keep)
     {
       if (keep != pool->memory)
@@ -271,12 +270,13 @@
           memmove (pool->memory, keep, size);
           keep = pool->memory;
         }
-      pool->pos = size;
     }
   pool->end = pool->size;
   memset (&pool->memory[size],
          0,
          pool->size - size);
+  if (NULL != keep)
+    pool->pos = ROUND_TO_ALIGN(size);
   return keep;
 }