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

Safeguard against NULL arguments

Browse source
This commit is contained in:
adamdunkels 2011-01-10 15:08:52 +00:00
parent 928cb1fc84
commit 70f9f075a0
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/net/rime/collect-neighbor.c
View file

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: collect-neighbor.c,v 1.9 2011/01/09 21:20:05 adamdunkels Exp $ * $Id: collect-neighbor.c,v 1.10 2011/01/10 15:08:52 adamdunkels Exp $
*/ */
/** /**
@ -144,6 +144,11 @@ collect_neighbor_list_add(struct collect_neighbor_list *neighbors_list,
{ {
struct collect_neighbor *n; struct collect_neighbor *n;
if(addr == NULL) {
PRINTF("collect_neighbor_list_add: attempt to add NULL addr\n");
return 0;
}
PRINTF("collect_neighbor_add: adding %d.%d\n", addr->u8[0], addr->u8[1]); PRINTF("collect_neighbor_add: adding %d.%d\n", addr->u8[0], addr->u8[1]);
/* Check if the collect_neighbor is already on the list. */ /* Check if the collect_neighbor is already on the list. */
@ -195,9 +200,11 @@ collect_neighbor_list_add(struct collect_neighbor_list *neighbors_list,
if(nrtmetric < worst_rtmetric) { if(nrtmetric < worst_rtmetric) {
n = worst_neighbor; n = worst_neighbor;
} }
if(n != NULL) {
PRINTF("collect_neighbor_add: not on list, not allocated, recycling %d.%d\n", PRINTF("collect_neighbor_add: not on list, not allocated, recycling %d.%d\n",
n->addr.u8[0], n->addr.u8[1]); n->addr.u8[0], n->addr.u8[1]);
} }
}
if(n != NULL) { if(n != NULL) {
n->age = 0; n->age = 0;