Merge pull request #18033 from donaldsharp/isis_leak_lists

isisd: Do not leak a linked list in the circuit
This commit is contained in:
Russ White 2025-02-06 13:14:50 -05:00 committed by GitHub
commit f04f611633
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions

View File

@ -840,12 +840,10 @@ void isis_circuit_down(struct isis_circuit *circuit)
if (circuit->u.bc.adjdb[0]) {
circuit->u.bc.adjdb[0]->del = isis_delete_adj;
list_delete(&circuit->u.bc.adjdb[0]);
circuit->u.bc.adjdb[0] = NULL;
}
if (circuit->u.bc.adjdb[1]) {
circuit->u.bc.adjdb[1]->del = isis_delete_adj;
list_delete(&circuit->u.bc.adjdb[1]);
circuit->u.bc.adjdb[1] = NULL;
}
if (circuit->u.bc.is_dr[0]) {
isis_dr_resign(circuit, 1);

View File

@ -83,7 +83,8 @@ static void circuit_commence_level(struct isis_circuit *circuit, int level)
send_hello_sched(circuit, level, TRIGGERED_IIH_DELAY);
circuit->u.bc.lan_neighs[level - 1] = list_new();
circuit->u.bc.adjdb[level - 1] = list_new();
if (!circuit->u.bc.adjdb[level - 1])
circuit->u.bc.adjdb[level - 1] = list_new();
}
}