Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mem_malloc should call MEM_SANITY while holding a lock #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mem_malloc should call MEM_SANITY while holding a lock #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/core/mem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,9 @@ mem_malloc(mem_size_t size_in)
lfree = cur;
LWIP_ASSERT("mem_malloc: !lfree->used", ((lfree == ram_end) || (!lfree->used)));
}
/* mem_link_valid ( called by MEM_SANITY() ) need to be called under protected conditions.
because, plug_holes which is called by mem_free will change data that used by mem_link_valid */
MEM_SANITY();
LWIP_MEM_ALLOC_UNPROTECT();
sys_mutex_unlock(&mem_mutex);
LWIP_ASSERT("mem_malloc: allocated memory not above ram_end.",
Expand All @@ -947,7 +950,6 @@ mem_malloc(mem_size_t size_in)
#if MEM_OVERFLOW_CHECK
mem_overflow_init_element(mem, size_in);
#endif
MEM_SANITY();
return (u8_t *)mem + SIZEOF_STRUCT_MEM + MEM_SANITY_OFFSET;
}
}
Expand Down
Loading