From 75f2c56558aee0f3476f170d2ccd96a28eeba710 Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Fri, 10 Jan 2014 21:26:28 +0100 Subject: [PATCH] bug #41188 Alignment error in memp_init() when MEMP_SEPARATE_POOLS==1 --- CHANGELOG | 3 +++ src/core/memp.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 3a8675bb..4c90081c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -80,6 +80,9 @@ HISTORY ++ Bugfixes: + 2014-01-10: Simon Goldschmidt + * memp.c: fixed bug #41188 Alignment error in memp_init() when MEMP_SEPARATE_POOLS==1 + 2014-01-10: Simon Goldschmidt * tcp.c: fixed bug #39898 tcp_fasttmr() possible lock due to infinte queue process loop diff --git a/src/core/memp.c b/src/core/memp.c index 1323463e..cc967981 100644 --- a/src/core/memp.c +++ b/src/core/memp.c @@ -369,7 +369,7 @@ memp_init(void) for (i = 0; i < MEMP_MAX; ++i) { memp_tab[i] = NULL; #if MEMP_SEPARATE_POOLS - memp = (struct memp*)memp_bases[i]; + memp = (struct memp*)LWIP_MEM_ALIGN(memp_bases[i]); #endif /* MEMP_SEPARATE_POOLS */ /* create a linked list of memp elements */ for (j = 0; j < memp_num[i]; ++j) {