michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: mesh: removed bug which is cause of divide by zero exception

Browse source 
If Client send transition time values as 0x40 or 0x80 or 0xC0 then
this was cause the behind divide by zero exception during calculation
of transition->counter. This PR will solve this bug.

Signed-off-by: Vikrant More <vikrant8051@gmail.com>
This commit is contained in:
Vikrant More 2019-01-21 14:23:36 +05:30 • committed by Johan Hedberg
commit 732cfac519
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
View file

@ -84,12 +84,15 @@ static void bound_states_transition_type_reassignment(u8_t type)
}
}
static void tt_values_calculator(struct transition *transition)
static bool tt_values_calculator(struct transition *transition)
{
u8_t steps_multiplier, resolution;
resolution = (transition->tt >> 6);
steps_multiplier = (transition->tt & 0x3F);
if (steps_multiplier == 0) {
return false;
}
switch (resolution) {
case 0: /* 100ms */
@ -113,6 +116,7 @@ static void tt_values_calculator(struct transition *transition)
}
ptr_counter = &transition->counter;
return true;
}
void onoff_tt_values(struct generic_onoff_state *state, u8_t tt, u8_t delay)
@ -122,9 +126,7 @@ void onoff_tt_values(struct generic_onoff_state *state, u8_t tt, u8_t delay)
state->transition->tt = tt;
state->transition->delay = delay;
if (tt != 0) {
tt_values_calculator(state->transition);
} else {
if (!tt_values_calculator(state->transition)) {
return;
}
@ -147,9 +149,7 @@ void level_tt_values(struct generic_level_state *state, u8_t tt, u8_t delay)
state->transition->tt = tt;
state->transition->delay = delay;
if (tt != 0) {
tt_values_calculator(state->transition);
} else {
if (!tt_values_calculator(state->transition)) {
return;
}
@ -168,9 +168,7 @@ void light_lightness_actual_tt_values(struct light_lightness_state *state,
state->transition->tt = tt;
state->transition->delay = delay;
if (tt != 0) {
tt_values_calculator(state->transition);
} else {
if (!tt_values_calculator(state->transition)) {
return;
}
@ -190,9 +188,7 @@ void light_lightness_linear_tt_values(struct light_lightness_state *state,
state->transition->tt = tt;
state->transition->delay = delay;
if (tt != 0) {
tt_values_calculator(state->transition);
} else {
if (!tt_values_calculator(state->transition)) {
return;
}
@ -211,9 +207,7 @@ void light_ctl_tt_values(struct light_ctl_state *state, u8_t tt, u8_t delay)
state->transition->tt = tt;
state->transition->delay = delay;
if (tt != 0) {
tt_values_calculator(state->transition);
} else {
if (!tt_values_calculator(state->transition)) {
return;
}
@ -241,9 +235,7 @@ void light_ctl_temp_tt_values(struct light_ctl_state *state,
state->transition->tt = tt;
state->transition->delay = delay;
if (tt != 0) {
tt_values_calculator(state->transition);
} else {
if (!tt_values_calculator(state->transition)) {
return;
}