Merge pull request FRRouting#28 from opensourcerouting/pathd-pcep-rebase-fix_mem_error

GalaxyGorilla · web-flow · commit 6dee0bf6e328 · 2020-06-29T20:17:10.000+02:00
pathd: fix heap use after deletion
diff --git a/pathd/path_nb_config.c b/pathd/path_nb_config.c
@@ -132,9 +132,10 @@ int pathd_te_segment_list_segment_destroy(struct nb_cb_destroy_args *args)
 		return NB_OK;
 
 	segment = nb_running_unset_entry(args->dnode);
-	srte_segment_entry_del(segment);
 	SET_FLAG(segment->segment_list->flags, F_SEGMENT_LIST_MODIFIED);
 
+	srte_segment_entry_del(segment);
+
 	return NB_OK;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,10 @@ int pathd_te_segment_list_segment_destroy(struct nb_cb_destroy_args *args)`
`132`	`132`	`return NB_OK;`
`133`	`133`
`134`	`134`	`segment = nb_running_unset_entry(args->dnode);`
`135`		`- srte_segment_entry_del(segment);`
`136`	`135`	`SET_FLAG(segment->segment_list->flags, F_SEGMENT_LIST_MODIFIED);`
`137`	`136`
	`137`	`+ srte_segment_entry_del(segment);`
	`138`	`+`
`138`	`139`	`return NB_OK;`
`139`	`140`	`}`
`140`	`141`