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

Check callback pointers to avoid calling a NULL pointer

Browse source
This commit is contained in:
Adam Dunkels 2012-12-10 01:09:14 +01:00
parent aaa950ab17
commit 4324d74f12
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/net/rime/mesh.c
View file

@ -126,11 +126,15 @@ found_route(struct route_discovery_conn *rdc, const rimeaddr_t *dest)
c->queued_data = NULL; c->queued_data = NULL;
rt = route_lookup(dest); rt = route_lookup(dest);
if (rt != NULL) { if(rt != NULL) {
multihop_resend(&c->multihop, &rt->nexthop); multihop_resend(&c->multihop, &rt->nexthop);
c->cb->sent(c); if(c->cb->sent != NULL) {
c->cb->sent(c);
}
} else { } else {
c->cb->timedout(c); if(c->cb->timedout != NULL) {
c->cb->timedout(c);
}
} }
} }
} }
@ -191,7 +195,9 @@ mesh_send(struct mesh_conn *c, const rimeaddr_t *to)
PRINTF("mesh_send: could not send\n"); PRINTF("mesh_send: could not send\n");
return 0; return 0;
} }
c->cb->sent(c); if(c->cb->sent != NULL) {
c->cb->sent(c);
}
return 1; return 1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/