diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-06-26 01:46:30 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-26 01:46:30 +0000 |
| commit | a022379107a6c55d5c8ce393d1f5da6691ccac3c (patch) | |
| tree | d5ecd8e834e4963f863415113fc0df56f9c0e228 /include | |
| parent | f25bbd6c56e55c4dca7239f0c56eb4b6bee1b155 (diff) | |
Fix incorrect calls to ast_bridge_impart().
There was a misunderstanding about ast_bridge_impart()'s handling of the
imparted channel's reference. The channel reference is passed by the
caller unless ast_bridge_impart() returns an error.
* Fixed a memory leak in conf_announce_channel_push() if the impart
failed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/bridging.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/bridging.h b/include/asterisk/bridging.h index 850245827..6e6d73b4a 100644 --- a/include/asterisk/bridging.h +++ b/include/asterisk/bridging.h @@ -654,7 +654,7 @@ enum ast_bridge_channel_state ast_bridge_join(struct ast_bridge *bridge, * \brief Impart (non-blocking) a channel onto a bridge * * \param bridge Bridge to impart on - * \param chan Channel to impart + * \param chan Channel to impart (The channel reference is stolen if impart successful.) * \param swap Channel to swap out if swapping. NULL if not swapping. * \param features Bridge features structure. * \param independent TRUE if caller does not want to reclaim the channel using ast_bridge_depart(). |