kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 11:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Jordan
2015-04-20 06:29:56 -05:00
committed by Gerrit Code Review
parent 9581a0ebf3 f0c82a173a
commit 27a122af66
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/pbx.c
View File

@@ -10734,6 +10734,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];