From fcb04d889a51122ded985c18c455851ba96e48a0 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Mon, 7 Apr 2014 20:41:05 +0000 Subject: PJSIP: Ensure test event has new state The change that fixed the pubsub test event's use of a dangling pointer also changed when it was processed relative to the pjsip subscription state change processing. This change corrects the order of events while holding a reference to the pointer that was previously dangling. ........ Merged revisions 411883 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411884 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_pjsip_pubsub.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'res') diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index 468346024..43f00518e 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -466,16 +466,21 @@ pjsip_dialog *ast_sip_subscription_get_dlg(struct ast_sip_subscription *sub) int ast_sip_subscription_send_request(struct ast_sip_subscription *sub, pjsip_tx_data *tdata) { struct ast_sip_endpoint *endpoint = ast_sip_subscription_get_endpoint(sub); + int res; + + ao2_ref(sub, +1); + res = pjsip_evsub_send_request(ast_sip_subscription_get_evsub(sub), + tdata) == PJ_SUCCESS ? 0 : -1; ast_test_suite_event_notify("SUBSCRIPTION_STATE_SET", "StateText: %s\r\n" "Endpoint: %s\r\n", pjsip_evsub_get_state_name(ast_sip_subscription_get_evsub(sub)), ast_sorcery_object_get_id(endpoint)); + ao2_cleanup(sub); ao2_cleanup(endpoint); - return pjsip_evsub_send_request(ast_sip_subscription_get_evsub(sub), - tdata) == PJ_SUCCESS ? 0 : -1; + return res; } static void subscription_datastore_destroy(void *obj) -- cgit v1.2.3