summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorliang yongxiang <[email protected]>2018-03-28 10:17:24 +0800
committerliang yongxiang <[email protected]>2018-03-28 10:19:32 +0800
commitb09445cbfe1e8105b244a9e1819c2826d1be14e9 (patch)
tree11b911cf6b66dfae6003bc9d1c00dc3c830079e0 /src
parentc6a5a2a3864e54d773afd207f3da7d159415d151 (diff)
[Kernel][memheap] fix rt_realloc bugs
- missing free old memory after malloc new - free memory when new size is zero
Diffstat (limited to 'src')
-rw-r--r--src/memheap.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/memheap.c b/src/memheap.c
index dcd9114620..7317ebdbab 100644
--- a/src/memheap.c
+++ b/src/memheap.c
@@ -659,6 +659,12 @@ void *rt_realloc(void *rmem, rt_size_t newsize)
if (rmem == RT_NULL)
return rt_malloc(newsize);
+ if (newsize == 0)
+ {
+ rt_free(rmem);
+ return RT_NULL;
+ }
+
/* get old memory item */
header_ptr = (struct rt_memheap_item *)
((rt_uint8_t *)rmem - RT_MEMHEAP_SIZE);
@@ -678,6 +684,8 @@ void *rt_realloc(void *rmem, rt_size_t newsize)
rt_memcpy(new_ptr, rmem, oldsize);
else
rt_memcpy(new_ptr, rmem, newsize);
+
+ rt_free(rmem);
}
}