abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-24 09:06:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

mem: added an MEMP_OVERFLOW_CHECK implementation for MEM_USE_POOLS; added another unit test

Browse Source
This commit is contained in:
goldsimon
2014-12-10 09:48:50 +01:00
parent dbe33783c9
commit 0ff98eb2f5
3 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/mem.c
View File

@@ -116,6 +116,11 @@ again:
/* and return a pointer to the memory directly after the struct memp_malloc_helper */
ret = (u8_t*)element + LWIP_MEM_ALIGN_SIZE(sizeof(struct memp_malloc_helper));
#if MEMP_OVERFLOW_CHECK
/* initialize unused memory */
element->size = size;
memset((u8_t*)ret + size, 0xcd, memp_sizes[poolnr] - size);
#endif /* MEMP_OVERFLOW_CHECK */
return ret;
}
@@ -141,6 +146,19 @@ mem_free(void *rmem)
LWIP_ASSERT("hmem == MEM_ALIGN(hmem)", (hmem == LWIP_MEM_ALIGN(hmem)));
LWIP_ASSERT("hmem->poolnr < MEMP_MAX", (hmem->poolnr < MEMP_MAX));
#if MEMP_OVERFLOW_CHECK
{
u16_t i;
LWIP_ASSERT("MEM_USE_POOLS: invalid chunk size",
hmem->size <= memp_sizes[hmem->poolnr]);
/* check that unused memory remained untouched */
for (i = hmem->size; i < memp_sizes[hmem->poolnr]; i++) {
u8_t data = *((u8_t*)rmem + i);
LWIP_ASSERT("MEM_USE_POOLS: mem overflow detected", data == 0xcd);
}
}
#endif /* MEMP_OVERFLOW_CHECK */
/* and put it in the pool we saved earlier */
memp_free(hmem->poolnr, hmem);
}