未验证 提交 8ea9dd65 编写于 作者: B Bernard Xiong 提交者: GitHub

Merge pull request #1321 from TanekLiang/memheap-fixed

[Kernel][memheap] fix rt_realloc bugs
......@@ -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);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册