libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #156 from grissiom/fix-event_recv 

rt_event_recv: add a check on the option flag
This commit is contained in:
Bernard Xiong 2013-09-14 19:24:38 -07:00
parent 63394f5d1b c465bc2c2e
commit 47c152ee7f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ipc.c
View File

@ -45,6 +45,7 @@
* 2010-10-26 yi.qiu add module support in rt_mp_delete and rt_mq_delete * 2010-10-26 yi.qiu add module support in rt_mp_delete and rt_mq_delete
* 2010-11-10 Bernard add IPC reset command implementation. * 2010-11-10 Bernard add IPC reset command implementation.
* 2011-12-18 Bernard add more parameter checking in message queue * 2011-12-18 Bernard add more parameter checking in message queue
* 2013-09-14 Grissiom add an option check in rt_event_recv
*/ */
#include <rtthread.h> #include <rtthread.h>
@ -1079,7 +1080,8 @@ RTM_EXPORT(rt_event_send);
* *
* @param event the fast event object * @param event the fast event object
* @param set the interested event set * @param set the interested event set
* @param option the receive option * @param option the receive option, either RT_EVENT_FLAG_AND or
* RT_EVENT_FLAG_OR should be set.
* @param timeout the waiting time * @param timeout the waiting time
* @param recved the received event * @param recved the received event
* *
@ -1125,6 +1127,11 @@ rt_err_t rt_event_recv(rt_event_t event,
if (event->set & set) if (event->set & set)
status = RT_EOK; status = RT_EOK;
} }
else
{
/* either RT_EVENT_FLAG_AND or RT_EVENT_FLAG_OR should be set */
RT_ASSERT(0);
}
if (status == RT_EOK) if (status == RT_EOK)
{ {