[Pkg-voip-commits] r9289 - in /asterisk/branches/squeeze/debian: changelog patches/fix_bridging_crash patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Wed Sep 28 01:11:40 2011
New Revision: 9289

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9289
Log:
Patch fix_bridging_crash: segfault in bridging API (Closes: #639821).

Added:
    asterisk/branches/squeeze/debian/patches/fix_bridging_crash
Modified:
    asterisk/branches/squeeze/debian/changelog
    asterisk/branches/squeeze/debian/patches/series

Modified: asterisk/branches/squeeze/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/changelog?rev=9289&op=diff
==============================================================================
--- asterisk/branches/squeeze/debian/changelog (original)
+++ asterisk/branches/squeeze/debian/changelog Wed Sep 28 01:11:40 2011
@@ -1,8 +1,12 @@
 asterisk (1:1.6.2.9-2+squeeze4) stable; urgency=low
 
-  * Fix sporadic segfault in chan_sip.so (Closes: 630381)
-
- -- Kilian Krause <kilian at debian.org>  Mon, 25 Jul 2011 15:12:25 +0200
+  [ Kilian Krause ]
+  * Fix sporadic segfault in chan_sip.so (Closes: #630381).
+
+  [ Tzafrir Cohen ]
+  * Patch fix_bridging_crash: segfault in bridging API (Closes: #639821).
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Tue, 27 Sep 2011 23:26:24 +0000
 
 asterisk (1:1.6.2.9-2+squeeze3) stable-security; urgency=high
 

Added: asterisk/branches/squeeze/debian/patches/fix_bridging_crash
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/patches/fix_bridging_crash?rev=9289&op=file
==============================================================================
--- asterisk/branches/squeeze/debian/patches/fix_bridging_crash (added)
+++ asterisk/branches/squeeze/debian/patches/fix_bridging_crash Wed Sep 28 01:11:40 2011
@@ -1,0 +1,38 @@
+From: Paul Belanger <paul.belanger at polybeacon.com>
+Date: Wed, 2 Jun 2010 13:34:09 +0000
+Subject: pthread_join to assure the thread is really gone
+Bug: https://issues.asterisk.org/view.php?id=15465
+Origin: http://svnview.digium.com/svn/asterisk?view=rev&rev=266878
+Bug-Debian: http://bugs.debian.org/639821
+
+Review: https://reviewboard.asterisk.org/r/679/
+
+---
+ main/bridging.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/main/bridging.c b/main/bridging.c
+index 2f5afa2..e034543 100644
+--- a/main/bridging.c
++++ b/main/bridging.c
+@@ -626,11 +626,16 @@ static int smart_bridge_operation(struct ast_bridge *bridge, struct ast_bridge_c
+ 		if (new_technology->capabilities & AST_BRIDGE_CAPABILITY_THREAD) {
+ 			ast_debug(1, "Telling current bridge thread for bridge %p to refresh\n", bridge);
+ 			bridge->refresh = 1;
++			bridge_poke(bridge);
+ 		} else {
++			pthread_t bridge_thread = bridge->thread;
+ 			ast_debug(1, "Telling current bridge thread for bridge %p to stop\n", bridge);
+ 			bridge->stop = 1;
++			bridge_poke(bridge);
++			ao2_unlock(bridge);
++			pthread_join(bridge_thread, NULL);
++			ao2_lock(bridge);
+ 		}
+-		bridge_poke(bridge);
+ 	}
+ 
+ 	/* Since we are soon going to pass this bridge to a new technology we need to NULL out the bridge_pvt pointer but don't worry as it still exists in temp_bridge, ditto for the old technology */
+-- 
+1.7.6.3
+

Modified: asterisk/branches/squeeze/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/patches/series?rev=9289&op=diff
==============================================================================
--- asterisk/branches/squeeze/debian/patches/series (original)
+++ asterisk/branches/squeeze/debian/patches/series Wed Sep 28 01:11:40 2011
@@ -40,3 +40,5 @@
 
 # bugfix for #630381
 chan_sip_hotfix_for_AST-2011-005-p2
+
+fix_bridging_crash