diff options
| author | Mark Michelson <mmichelson@digium.com> | 2014-08-11 16:03:41 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2014-08-11 16:03:41 +0000 |
| commit | b4e33c81e320a847be7b487c270c7be52ebe64fb (patch) | |
| tree | bc06a5aa6403386d4088e38d2c6b87982e41c742 /res | |
| parent | becf7c70037dfe77b407bb118e1b2b995fd609bf (diff) | |
Fix crash encountered by the testsuite.
Running testsuite tests locally produced no errors, but when
run using the continuous integration framework, crashes occurred.
The crashes occurred due to a refcounting error that had been fixed
for a similar situation.
........
Merged revisions 420758 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_pubsub.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index f3504ae44..c9e8834c6 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -2032,7 +2032,10 @@ int ast_sip_subscription_notify(struct ast_sip_subscription *sub, void *notify_d if (sub->tree->notification_batch_interval) { return schedule_notification(sub->tree); } else { + /* See the note in pubsub_on_rx_refresh() for why sub->tree is refbumped here */ + ao2_ref(sub->tree, +1); return send_notify(sub->tree, 0); + ao2_ref(sub->tree, -1); } } |