kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

PJSIP: Fix crash introduced in r411671

Browse Source 
The test event introduced in revision 411671 uses a dangling pointer to
access information about pubsub state changes. This moves the event to
within the lifetime of the pointer.
........

Merged revisions 411790 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-04-07 13:30:25 +00:00
parent ea290b2c3e
commit 5d9a1281ee
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_pjsip_pubsub.c
View File

@@ -466,17 +466,16 @@ 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) 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); struct ast_sip_endpoint *endpoint = ast_sip_subscription_get_endpoint(sub);
int res = pjsip_evsub_send_request(ast_sip_subscription_get_evsub(sub),
tdata) == PJ_SUCCESS ? 0 : -1;
ast_test_suite_event_notify("SUBSCRIPTION_STATE_SET", ast_test_suite_event_notify("SUBSCRIPTION_STATE_SET",
"StateText: %s\r\n" "StateText: %s\r\n"
"Endpoint: %s\r\n", "Endpoint: %s\r\n",
pjsip_evsub_get_state_name(ast_sip_subscription_get_evsub(sub)), pjsip_evsub_get_state_name(ast_sip_subscription_get_evsub(sub)),
ast_sorcery_object_get_id(endpoint)); ast_sorcery_object_get_id(endpoint));
ao2_cleanup(endpoint); ao2_cleanup(endpoint);
return res;
return pjsip_evsub_send_request(ast_sip_subscription_get_evsub(sub),
tdata) == PJ_SUCCESS ? 0 : -1;
} }
static void subscription_datastore_destroy(void *obj) static void subscription_datastore_destroy(void *obj)