Merge "main/pbx: Don't attempt to destroy a previously destroyed exten/priority tuple" into 11

changes/71/171/1
Matt Jordan 10 years ago committed by Gerrit Code Review
commit 82bd20ed9c

@ -10886,6 +10886,16 @@ void __ast_context_destroy(struct ast_context *list, struct ast_hashtab *context
exten_iter = ast_hashtab_start_traversal(tmp->root_table); exten_iter = ast_hashtab_start_traversal(tmp->root_table);
while ((exten_item=ast_hashtab_next(exten_iter))) { while ((exten_item=ast_hashtab_next(exten_iter))) {
int end_traversal = 1; 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); prio_iter = ast_hashtab_start_traversal(exten_item->peer_table);
while ((prio_item=ast_hashtab_next(prio_iter))) { while ((prio_item=ast_hashtab_next(prio_iter))) {
char extension[AST_MAX_EXTENSION]; char extension[AST_MAX_EXTENSION];

Loading…
Cancel
Save