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: better check for value wraps

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2019-06-13 10:53:31 +03:00
parent fd62683c0d
commit 2c54092e7e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/memorypool.c
+3 -2
View File
@@ -268,7 +268,7 @@ MHD_pool_reallocate (struct MemoryPool *pool,
/* Blocks "from the end" must not be reallocated */
mhd_assert (old == NULL || pool->memory + pool->pos > (uint8_t*)old);
if (pool->memory + new_size + 2 * ALIGN_SIZE< pool->memory)
if (new_size + 2 * ALIGN_SIZE < new_size)
return NULL; /* Value wrap, too large new_size. */
if (0 != old_size)
@@ -278,7 +278,8 @@ MHD_pool_reallocate (struct MemoryPool *pool,
if (pool->pos == ROUND_TO_ALIGN (old_offset + old_size))
{ /* "old" block is the last allocated block */
const size_t new_apos = ROUND_TO_ALIGN (old_offset + new_size);
if (new_apos > pool->end)
if ( (new_apos > pool->end) ||
(new_apos < pool->pos) ) /* Value wrap */
return NULL; /* No space */
pool->pos = new_apos;