mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aligned MIN_SIZE, memset(0) the complete ram_heap instead of only the used area, only to be on the safe side...

Browse Source
This commit is contained in:
goldsimon 2007-05-15 10:35:48 +00:00
parent 6c39b8a10c
commit 8ef712787a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/mem.c
View File

@ -132,8 +132,8 @@ mem_init(void)
(SIZEOF_STRUCT_MEM & (MEM_ALIGNMENT-1)) == 0); (SIZEOF_STRUCT_MEM & (MEM_ALIGNMENT-1)) == 0);
/* align the heap */ /* align the heap */
memset(ram_heap, 0, sizeof(ram_heap));
ram = MEM_ALIGN(ram_heap); ram = MEM_ALIGN(ram_heap);
memset(ram, 0, MEM_SIZE_ALIGNED);
/* initialize the start of the heap */ /* initialize the start of the heap */
mem = (struct mem *)ram; mem = (struct mem *)ram;
mem->next = MEM_SIZE_ALIGNED; mem->next = MEM_SIZE_ALIGNED;
@ -224,9 +224,9 @@ mem_realloc(void *rmem, mem_size_t newsize)
return NULL; return NULL;
} }
if(newsize < MIN_SIZE) { if(newsize < MIN_SIZE_ALIGNED) {
/* every data block must be at least MIN_SIZE long */ /* every data block must be at least MIN_SIZE_ALIGNED long */
newsize = MIN_SIZE; newsize = MIN_SIZE_ALIGNED;
} }
LWIP_ASSERT("mem_realloc: legal memory", (u8_t *)rmem >= (u8_t *)ram && LWIP_ASSERT("mem_realloc: legal memory", (u8_t *)rmem >= (u8_t *)ram &&
@ -274,8 +274,8 @@ mem_realloc(void *rmem, mem_size_t newsize)
if (mem2->next != MEM_SIZE_ALIGNED) { if (mem2->next != MEM_SIZE_ALIGNED) {
((struct mem *)&ram[mem2->next])->prev = ptr2; ((struct mem *)&ram[mem2->next])->prev = ptr2;
} }
} else if (newsize + SIZEOF_STRUCT_MEM + MIN_SIZE < size) { } else if (newsize + SIZEOF_STRUCT_MEM + MIN_SIZE_ALIGNED < size) {
/* There's room for another struct mem with at least MIN_SIZE of data. */ /* There's room for another struct mem with at least MIN_SIZE_ALIGNED of data. */
ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize; ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize;
mem2 = (struct mem *)&ram[ptr2]; mem2 = (struct mem *)&ram[ptr2];
mem2->used = 0; mem2->used = 0;
@ -392,9 +392,9 @@ mem_malloc(mem_size_t size)
adjust for alignment. */ adjust for alignment. */
size = MEM_ALIGN_SIZE(size); size = MEM_ALIGN_SIZE(size);
if(size < MIN_SIZE) { if(size < MIN_SIZE_ALIGNED) {
/* every data block must be at least MIN_SIZE long */ /* every data block must be at least MIN_SIZE_ALIGNED long */
size = MIN_SIZE; size = MIN_SIZE_ALIGNED;
} }
if (size > MEM_SIZE_ALIGNED) { if (size > MEM_SIZE_ALIGNED) {
@ -415,9 +415,9 @@ mem_malloc(mem_size_t size)
(mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size) { (mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size) {
/* mem is not used and at least perfect fit is possible */ /* mem is not used and at least perfect fit is possible */
if (mem->next - (ptr + (2*SIZEOF_STRUCT_MEM) + MIN_SIZE) >= size) { if (mem->next - (ptr + (2*SIZEOF_STRUCT_MEM) + MIN_SIZE_ALIGNED) >= size) {
/* split large block, create empty remainder, /* split large block, create empty remainder,
remainder must be large enough to contain MIN_SIZE data: if remainder must be large enough to contain MIN_SIZE_ALIGNED data: if
mem->next - (ptr + (2*SIZEOF_STRUCT_MEM)) == size, mem->next - (ptr + (2*SIZEOF_STRUCT_MEM)) == size,
struct mem would fit in but no data between mem2 and mem2->next struct mem would fit in but no data between mem2 and mem2->next
*/ */