[asterisk-commits] mjordan: branch 13 r426432 - in /branches/13: ./ main/bridge.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Oct 28 11:40:59 2014
New Revision: 426432

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=426432
Log:
main/bridge: Destroy features struct on off nominal path during bridge impart

When a channel is imparted to a bridge, the invocation of the function may
provide an ast_bridge_features struct. Upon passing this to ast_bridge_impart,
the caller must assume that ownership has passed to the function, as in all
paths the function destroys the struct prior to returning (as its purpose is
to configure the behavior of the channel while in the bridge). On one off
nominal path - where the channel already has a PBX thread - the struct was not
being destroyed.

This patch fixes that glitch.

ASTERISK-24437 #close
Reported by: Scott Griepentrog
........

Merged revisions 426431 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    branches/13/   (props changed)
    branches/13/main/bridge.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/main/bridge.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/main/bridge.c?view=diff&rev=426432&r1=426431&r2=426432
==============================================================================
--- branches/13/main/bridge.c (original)
+++ branches/13/main/bridge.c Tue Oct 28 11:40:59 2014
@@ -1677,6 +1677,7 @@
 	if (ast_channel_pbx(chan)) {
 		ast_log(AST_LOG_WARNING, "Channel %s has a PBX thread and cannot be imparted into bridge %s\n",
 			ast_channel_name(chan), bridge->uniqueid);
+		ast_bridge_features_destroy(features);
 		return -1;
 	}