MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #916 from jmattsson/tmr-limit-check 

Range check the tmr interval value.
This commit is contained in:
Terry Ellison 2016-01-10 11:32:15 +00:00
parent dcbdfc8e70 3fb0de859f
commit e9f16d1ace
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/modules/tmr.c
View File

@ -140,10 +140,11 @@ static int tmr_register(lua_State* L){
sint32_t interval = luaL_checkinteger(L, 2);
uint8_t mode = luaL_checkinteger(L, 3);
//validate arguments
uint8_t args_valid = interval <= 0
const int32_t MAX_TIMEOUT = 0xC49BA5; // assuming system_timer_reinit() has *not* been called
uint8_t args_invalid = (interval <= 0 || interval > MAX_TIMEOUT)
|| (mode != TIMER_MODE_SINGLE && mode != TIMER_MODE_SEMI && mode != TIMER_MODE_AUTO)
|| (lua_type(L, 4) != LUA_TFUNCTION && lua_type(L, 4) != LUA_TLIGHTFUNCTION);
if(args_valid)
if(args_invalid)
return luaL_error(L, "wrong arg range");
//get the lua function reference
lua_pushvalue(L, 4);