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

Merge "res_pjsip_pubsub: Prevent crash from AMI command on freed subscription."

Browse Source
This commit is contained in:
Matt Jordan
2016-01-26 07:05:52 -06:00
committed by Gerrit Code Review
parent 3f1b8a01d6 b073244c51
commit f8bf72a417
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_pjsip_pubsub.c
View File

@@ -1202,8 +1202,6 @@ static void subscription_tree_destructor(void *obj)
ast_debug(3, "Destroying subscription tree %p\n", sub_tree); ast_debug(3, "Destroying subscription tree %p\n", sub_tree);
remove_subscription(sub_tree);
ao2_cleanup(sub_tree->endpoint); ao2_cleanup(sub_tree->endpoint);
destroy_subscriptions(sub_tree->root); destroy_subscriptions(sub_tree->root);
@@ -3295,6 +3293,7 @@ static void pubsub_on_evsub_state(pjsip_evsub *evsub, pjsip_event *event)
} }
} }
remove_subscription(sub_tree);
pjsip_evsub_set_mod_data(evsub, pubsub_module.id, NULL); pjsip_evsub_set_mod_data(evsub, pubsub_module.id, NULL);
sub_tree->evsub = NULL; sub_tree->evsub = NULL;
ast_sip_dialog_set_serializer(sub_tree->dlg, NULL); ast_sip_dialog_set_serializer(sub_tree->dlg, NULL);