From: Richard Mudgett Date: Fri, 8 Feb 2013 17:37:27 +0000 (+0000) Subject: app_confbridge: Fix crash from receiving an AMI action after ConfBridge unloaded. X-Git-Tag: 13.0.0-beta1~2114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9da5ef1b911e9d3883286fd79d44978ee8c4e1af;p=thirdparty%2Fasterisk.git app_confbridge: Fix crash from receiving an AMI action after ConfBridge unloaded. Unloading ConfBridge caused the next AMI action received to crash Asterisk. * Add the missing unregister of AMI action ConfbridgeSetSingleVideoSrc when ConfBridge is unloaded. (closes issue ASTERISK-20994) Reported by: Jeremy Kister Patches: jira_asterisk_20994_v11.patch (license #5621) patch uploaded by rmudgett Tested by: Rusty Newton, Jeremy Kister ........ Merged revisions 381067 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381069 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 65498bd90b..37bc4a3211 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -2995,6 +2995,7 @@ static int unload_module(void) res |= ast_manager_unregister("ConfbridgeLock"); res |= ast_manager_unregister("ConfbridgeStartRecord"); res |= ast_manager_unregister("ConfbridgeStopRecord"); + res |= ast_manager_unregister("ConfbridgeSetSingleVideoSrc"); return res; }