Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coverity CID 2718: Avoid using free'd memory.

This commit is contained in:
christos 2006-05-25 01:38:41 +00:00
parent d6dd729f42
commit 43c323928f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/mrouted/vif.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vif.c,v 1.16 2006/05/09 20:18:09 mrg Exp $ */ /* $NetBSD: vif.c,v 1.17 2006/05/25 01:38:41 christos Exp $ */
/* /*
* The mrouted program is covered by the license in the accompanying file * The mrouted program is covered by the license in the accompanying file
@ -1197,10 +1197,7 @@ age_vifs(void)
v->uv_flags |= VIFF_LEAF; v->uv_flags |= VIFF_LEAF;
} }
for (prev_a = (struct listaddr *)&(v->uv_neighbors), for (prev_a = a = v->uv_neighbors; a != NULL;) {
a = v->uv_neighbors;
a != NULL;
prev_a = a, a = a->al_next) {
if ((a->al_timer += TIMER_INTERVAL) < NEIGHBOR_EXPIRE_TIME) if ((a->al_timer += TIMER_INTERVAL) < NEIGHBOR_EXPIRE_TIME)
continue; continue;
@ -1212,9 +1209,15 @@ age_vifs(void)
* another neighbor with a lower IP address than mine. * another neighbor with a lower IP address than mine.
*/ */
addr = a->al_addr; addr = a->al_addr;
prev_a->al_next = a->al_next; if (a == v->uv_neighbors) {
free((char *)a); v->uv_neighbors = a->al_next;
a = prev_a; free((char *)a);
prev_a = a = v->uv_neighbors;
} else {
prev_a->al_next = a->al_next;
free((char *)a);
prev_a = a = prev_a->al_next;
}
delete_neighbor_from_routes(addr, vifi); delete_neighbor_from_routes(addr, vifi);