[svn-commits] kmoore: trunk r327748 - /trunk/apps/app_confbridge.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Tue Jul 12 09:40:16 2011
New Revision: 327748

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=327748
Log:
Segfault on shutdown when confbridge is active

When undergoing a shutdown and channels are kicked out of a bridge, a segfault
occurs because ConfBridge tries to play sounds on the bridge after the
underlying channels have been blown away due to the shutdown.

(closes ASTERISK-18040)
Review: https://reviewboard.asterisk.org/r/1283/

Modified:
    trunk/apps/app_confbridge.c

Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=327748&r1=327747&r2=327748
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Tue Jul 12 09:40:16 2011
@@ -1473,6 +1473,13 @@
 		&conference_bridge_user.tech_args);
 	send_leave_event(conference_bridge_user.chan, conference_bridge->name);
 
+	/* if we're shutting down, don't attempt to do further processing */
+	if (ast_shutting_down()) {
+		leave_conference_bridge(conference_bridge, &conference_bridge_user);
+		conference_bridge = NULL;
+		goto confbridge_cleanup;
+	}
+
 	/* If this user was a video source, we need to clean up and possibly pick a new source. */
 	handle_video_on_exit(conference_bridge, conference_bridge_user.chan);