Merge pull request FRRouting#20462 from FRRouting/mergify/bp/stable/10.1/pr-20171

donaldsharp · web-flow · commit 07055b5e9594 · 2026-01-13T16:01:44.000-05:00
isisd: fix crash when changing isis type (backport FRRouting#20171)
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
@@ -2040,6 +2040,8 @@ void isis_spf_invalidate_routes(struct isis_spftree *tree)
 {
 	struct isis_route_table_info *backup_info;
 
+	if (!tree)
+		return;
 	isis_route_invalidate_table(tree->area, tree->route_table);
 
 	/* Delete backup routes. */

Original file line number	Diff line number	Diff line change
`@@ -2040,6 +2040,8 @@ void isis_spf_invalidate_routes(struct isis_spftree *tree)`
`2040`	`2040`	`{`
`2041`	`2041`	`struct isis_route_table_info *backup_info;`
`2042`	`2042`
	`2043`	`+ if (!tree)`
	`2044`	`+ return;`
`2043`	`2045`	`isis_route_invalidate_table(tree->area, tree->route_table);`
`2044`	`2046`
`2045`	`2047`	`/* Delete backup routes. */`