libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #802 from armink/fix_realloc 

[Kernel] Fix rt_realloc issue when new size is 0.
This commit is contained in:
Bernard Xiong 2017-08-15 09:10:52 +08:00 committed by GitHub
parent b9dc1c5bee a7e7b3dc02
commit 05496a5c25
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mem.c
View File

@ -24,6 +24,7 @@
* fix memory check in rt_realloc function * fix memory check in rt_realloc function
* 2010-07-13 Bernard fix RT_ALIGN issue found by kuronca * 2010-07-13 Bernard fix RT_ALIGN issue found by kuronca
* 2010-10-14 Bernard fix rt_realloc issue when realloc a NULL pointer. * 2010-10-14 Bernard fix rt_realloc issue when realloc a NULL pointer.
* 2017-07-14 armink fix rt_realloc issue when new size is 0
*/ */
/* /*
@ -400,6 +401,11 @@ void *rt_realloc(void *rmem, rt_size_t newsize)
return RT_NULL; return RT_NULL;
} }
else if (newsize == 0)
{
rt_free(rmem);
return RT_NULL;
}
/* allocate a new memory block */ /* allocate a new memory block */
if (rmem == RT_NULL) if (rmem == RT_NULL)
@ -589,4 +595,3 @@ FINSH_FUNCTION_EXPORT(list_mem, list memory usage information)
#endif /* end of RT_USING_HEAP */ #endif /* end of RT_USING_HEAP */
#endif /* end of RT_USING_MEMHEAP_AS_HEAP */ #endif /* end of RT_USING_MEMHEAP_AS_HEAP */