From b99b7577fca92e9ad9697b56eb647c0498e3f7ce Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Wed, 16 Nov 2016 20:15:51 +0100 Subject: [PATCH] memp.c: Only check for overflow/underflow if an element could be allocated In other words: Don't dereference NULL pointers --- src/core/memp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/memp.c b/src/core/memp.c index 2e3db28e..2ecb1814 100644 --- a/src/core/memp.c +++ b/src/core/memp.c @@ -301,15 +301,15 @@ do_memp_malloc_pool_fn(const struct memp_desc *desc, const char* file, const int SYS_ARCH_PROTECT(old_level); 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 */ if (memp != NULL) { #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; #if MEMP_OVERFLOW_CHECK memp->next = NULL;