[svn-commits] mmichelson: trunk r420759 - in /trunk: ./ res/res_pjsip_pubsub.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Aug 11 11:03:41 2014
New Revision: 420759

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420759
Log:
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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_pubsub.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-13-merged (original)
+++ branch-13-merged Mon Aug 11 11:03:41 2014
@@ -1,1 +1,1 @@
-/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742
+/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758

Modified: trunk/res/res_pjsip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_pubsub.c?view=diff&rev=420759&r1=420758&r2=420759
==============================================================================
--- trunk/res/res_pjsip_pubsub.c (original)
+++ trunk/res/res_pjsip_pubsub.c Mon Aug 11 11:03:41 2014
@@ -2032,7 +2032,10 @@
 	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);
 	}
 }