libmicrohttpd

commit 5454d9f3b520e597dc783d974596c9591cf4631d
parent 66385ca7a586d1d4a0a68efe4be667d270127f89
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Sun, 25 Jan 2015 08:04:22 +0000

memorypool.c: prevent coping of uninitialized memory in MHD_pool_reset()

Diffstat:
M
src/microhttpd/memorypool.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
@@ -263,7 +263,6 @@ MHD_pool_reset (struct MemoryPool *pool,
 		void *keep,
 		size_t size)
 {
-  size = ROUND_TO_ALIGN (size);
   if (NULL != keep)
     {
       if (keep != pool->memory)
@@ -271,12 +270,13 @@ MHD_pool_reset (struct MemoryPool *pool,
           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;
 }