diff --git a/main/pbx.c b/main/pbx.c index 209de66d158bee70dfd0db8318da8422316b43d1..fee4191aa68896d469da8d7609472958fce5175b 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -10735,6 +10735,16 @@ void __ast_context_destroy(struct ast_context *list, struct ast_hashtab *context exten_iter = ast_hashtab_start_traversal(tmp->root_table); while ((exten_item=ast_hashtab_next(exten_iter))) { int end_traversal = 1; + + /* + * If the extension could not be removed from the root_table due to + * a loaded PBX app, it can exist here but have its peer_table be + * destroyed due to a previous pass through this function. + */ + if (!exten_item->peer_table) { + continue; + } + prio_iter = ast_hashtab_start_traversal(exten_item->peer_table); while ((prio_item=ast_hashtab_next(prio_iter))) { char extension[AST_MAX_EXTENSION];