ospf6d: Free up list memory

donaldsharp · donaldsharp · commit 710a61d57c8f · 2020-11-18T11:42:50.000-05:00
OSPFv3 snmp code creates a list but never deletes the actual
list.  Do so.

Signed-off-by: Donald Sharp &lt;sharpd@nvidia.com&gt;
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
@@ -1267,8 +1267,6 @@ static uint8_t *ospfv3NbrEntry(struct variable *v, oid *name, size_t *length,
 	} else {
 		/* We build a sorted list of interfaces */
 		ifslist = list_new();
-		if (!ifslist)
-			return NULL;
 		ifslist->cmp = (int (*)(void *, void *))if_icmp_func;
 		FOR_ALL_INTERFACES (vrf, iif)
 			listnode_add_sort(ifslist, iif);
@@ -1296,6 +1294,7 @@ static uint8_t *ospfv3NbrEntry(struct variable *v, oid *name, size_t *length,
 		}
 
 		list_delete_all_node(ifslist);
+		list_delete(&ifslist);
 	}
 
 	if (!oi || !on)

Original file line number	Diff line number	Diff line change
`@@ -1267,8 +1267,6 @@ static uint8_t ospfv3NbrEntry(struct variable v, oid name, size_t length,`
`1267`	`1267`	`} else {`
`1268`	`1268`	`/* We build a sorted list of interfaces */`
`1269`	`1269`	`ifslist = list_new();`
`1270`		`- if (!ifslist)`
`1271`		`- return NULL;`
`1272`	`1270`	`ifslist->cmp = (int ()(void , void *))if_icmp_func;`
`1273`	`1271`	`FOR_ALL_INTERFACES (vrf, iif)`
`1274`	`1272`	`listnode_add_sort(ifslist, iif);`
`@@ -1296,6 +1294,7 @@ static uint8_t ospfv3NbrEntry(struct variable v, oid name, size_t length,`
`1296`	`1294`	`}`
`1297`	`1295`
`1298`	`1296`	`list_delete_all_node(ifslist);`
	`1297`	`+ list_delete(&ifslist);`
`1299`	`1298`	`}`
`1300`	`1299`
`1301`	`1300`	`if (!oi \|\| !on)`