mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
memp.c: Only check for overflow/underflow if an element could be allocated
In other words: Don't dereference NULL pointers
This commit is contained in:
parent
f79eabd24b
commit
b99b7577fc
@ -301,15 +301,15 @@ do_memp_malloc_pool_fn(const struct memp_desc *desc, const char* file, const int
|
|||||||
SYS_ARCH_PROTECT(old_level);
|
SYS_ARCH_PROTECT(old_level);
|
||||||
|
|
||||||
memp = *desc->tab;
|
memp = *desc->tab;
|
||||||
|
|
||||||
#if MEMP_OVERFLOW_CHECK == 1
|
|
||||||
memp_overflow_check_element_overflow(memp, desc);
|
|
||||||
memp_overflow_check_element_underflow(memp, desc);
|
|
||||||
#endif /* MEMP_OVERFLOW_CHECK */
|
|
||||||
#endif /* MEMP_MEM_MALLOC */
|
#endif /* MEMP_MEM_MALLOC */
|
||||||
|
|
||||||
if (memp != NULL) {
|
if (memp != NULL) {
|
||||||
#if !MEMP_MEM_MALLOC
|
#if !MEMP_MEM_MALLOC
|
||||||
|
#if MEMP_OVERFLOW_CHECK == 1
|
||||||
|
memp_overflow_check_element_overflow(memp, desc);
|
||||||
|
memp_overflow_check_element_underflow(memp, desc);
|
||||||
|
#endif /* MEMP_OVERFLOW_CHECK */
|
||||||
|
|
||||||
*desc->tab = memp->next;
|
*desc->tab = memp->next;
|
||||||
#if MEMP_OVERFLOW_CHECK
|
#if MEMP_OVERFLOW_CHECK
|
||||||
memp->next = NULL;
|
memp->next = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user