deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #36 from yatch/pr-orchestra-add-null-checks

Browse source 
Add NULL checks into new_time_source of orchestra-rule-eb-per-time-source.c
This commit is contained in:
Simon Duquennoy 2016-05-21 19:30:19 +02:00
parent c7694e4dbd bc54f8bac3
commit 0418ee7446
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/orchestra/orchestra-rule-eb-per-time-source.c
View file

@ -74,8 +74,8 @@ select_packet(uint16_t *slotframe, uint16_t *timeslot)
static void static void
new_time_source(const struct tsch_neighbor *old, const struct tsch_neighbor *new) new_time_source(const struct tsch_neighbor *old, const struct tsch_neighbor *new)
{ {
uint16_t old_ts = get_node_timeslot(&old->addr); uint16_t old_ts = old != NULL ? get_node_timeslot(&old->addr) : 0xffff;
uint16_t new_ts = get_node_timeslot(&new->addr); uint16_t new_ts = new != NULL ? get_node_timeslot(&new->addr) : 0xffff;
if(new_ts == old_ts) { if(new_ts == old_ts) {
return; return;