mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-25 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

memorypool: fixed MHD_pool_reset()

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2019-06-16 17:52:03 +03:00
parent d12ed49fd3
commit c98aa3d334
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/memorypool.c
+4 -5
View File
@@ -331,6 +331,7 @@ MHD_pool_reset (struct MemoryPool *pool,
{
mhd_assert (pool->end >= pool->pos);
mhd_assert (pool->size >= pool->end - pool->pos);
mhd_assert (copy_bytes < new_size);
mhd_assert (keep != NULL || copy_bytes == 0);
mhd_assert (keep == NULL || pool->memory <= (uint8_t*)keep);
mhd_assert (keep == NULL || pool->memory + pool->size >= (uint8_t*)keep + copy_bytes);
@@ -341,17 +342,15 @@ MHD_pool_reset (struct MemoryPool *pool,
memmove (pool->memory,
keep,
copy_bytes);
keep = pool->memory;
}
pool->end = pool->size;
/* technically not needed, but safer to zero out */
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;
pool->pos = ROUND_TO_ALIGN (new_size);
pool->end = pool->size;
return pool->memory;
}