Merge pull request #3972 from mysterywolf/pr1
[bug fixed] add mutex values' overflow-check code
This commit is contained in:
commit
b0b1e0c1a4
14
src/ipc.c
14
src/ipc.c
|
@ -37,7 +37,7 @@
|
||||||
* 2020-07-29 Meco Man fix thread->event_set/event_info when received an
|
* 2020-07-29 Meco Man fix thread->event_set/event_info when received an
|
||||||
* event without pending
|
* event without pending
|
||||||
* 2020-10-11 Meco Man add semaphore values' overflow-check code
|
* 2020-10-11 Meco Man add semaphore values' overflow-check code
|
||||||
* in the function of rt_sem_release
|
* 2020-10-21 Meco Man add mutex values' overflow-check code
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <rtthread.h>
|
#include <rtthread.h>
|
||||||
|
@ -697,8 +697,16 @@ rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t time)
|
||||||
|
|
||||||
if (mutex->owner == thread)
|
if (mutex->owner == thread)
|
||||||
{
|
{
|
||||||
/* it's the same thread */
|
if(mutex->hold < 255u)
|
||||||
mutex->hold ++;
|
{
|
||||||
|
/* it's the same thread */
|
||||||
|
mutex->hold ++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
rt_hw_interrupt_enable(temp); /* enable interrupt */
|
||||||
|
return -RT_EFULL; /* value overflowed */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue