diff options
| author | Bernard Xiong <[email protected]> | 2015-09-25 09:25:26 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-09-25 09:25:26 +0800 |
| commit | 20b8293a8413ae22038ff64257541ee07b72bf35 (patch) | |
| tree | fffda6c8da36fca848f25672709d4afd1fef8a25 /src | |
| parent | 5b77fa2d114c980a581f606cbf1cfe6bb06ba8b7 (diff) | |
| parent | b4e3fb2007cc19abe5cd24103008396e791a4f4a (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'src')
| -rw-r--r-- | src/mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -304,6 +304,7 @@ void *rt_malloc(rt_size_t size) /* create mem2 struct */ mem2 = (struct heap_mem *)&heap_ptr[ptr2]; + mem2->magic = HEAP_MAGIC; mem2->used = 0; mem2->next = mem->next; mem2->prev = ptr; @@ -540,7 +541,7 @@ void rt_free(void *rmem) RT_ASSERT(mem->magic == HEAP_MAGIC); /* ... and is now unused. */ mem->used = 0; - mem->magic = 0; + mem->magic = HEAP_MAGIC; if (mem < lfree) { |
