djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5/modules/timer: Fixing bug in timer_find(). Function allowed to locate index out of range and started to look up in config pointer (index == size of array).

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-05-08 23:32:42 +02:00
parent 1063a44ec6
commit 00d96f5695
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nrf5/modules/machine/timer.c
View File

@ -65,7 +65,7 @@ void timer_init0(void) {
STATIC int timer_find(mp_obj_t id) { STATIC int timer_find(mp_obj_t id) {
// given an integer id // given an integer id
int timer_id = mp_obj_get_int(id); int timer_id = mp_obj_get_int(id);
if (timer_id >= 0 && timer_id <= MP_ARRAY_SIZE(machine_timer_obj) if (timer_id >= 0 && timer_id < MP_ARRAY_SIZE(machine_timer_obj)
&& machine_timer_obj[timer_id].p_config != NULL) { && machine_timer_obj[timer_id].p_config != NULL) {
return timer_id; return timer_id;
} }