kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 16:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect calls to ast_bridge_impart().

Browse Source 
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
This commit is contained in:
Richard Mudgett
2013-06-26 01:46:30 +00:00
parent f25bbd6c56
commit a022379107
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/confbridge/conf_chan_announce.c
View File

@@ -172,8 +172,8 @@ void conf_announce_channel_depart(struct ast_channel *chan)
int conf_announce_channel_push(struct ast_channel *ast) int conf_announce_channel_push(struct ast_channel *ast)
{ {
struct ast_bridge_features *features; struct ast_bridge_features *features;
struct ast_channel *chan;
RAII_VAR(struct announce_pvt *, p, NULL, ao2_cleanup); RAII_VAR(struct announce_pvt *, p, NULL, ao2_cleanup);
RAII_VAR(struct ast_channel *, chan, NULL, ast_channel_unref);
{ {
SCOPED_CHANNELLOCK(lock, ast); SCOPED_CHANNELLOCK(lock, ast);
@@ -192,12 +192,15 @@ int conf_announce_channel_push(struct ast_channel *ast)
features = ast_bridge_features_new(); features = ast_bridge_features_new();
if (!features) { if (!features) {
ast_channel_unref(chan);
return -1; return -1;
} }
ast_set_flag(&features->feature_flags, AST_BRIDGE_CHANNEL_FLAG_IMMOVABLE); ast_set_flag(&features->feature_flags, AST_BRIDGE_CHANNEL_FLAG_IMMOVABLE);
/* Impart the output channel into the bridge */ /* Impart the output channel into the bridge */
if (ast_bridge_impart(p->bridge, chan, NULL, features, 0)) { if (ast_bridge_impart(p->bridge, chan, NULL, features, 0)) {
ast_bridge_features_destroy(features);
ast_channel_unref(chan);
return -1; return -1;
} }
ao2_lock(p); ao2_lock(p);

6
channels/chan_sip.c
View File

@@ -24777,8 +24777,8 @@ static int handle_request_options(struct sip_pvt *p, struct sip_request *req, st
static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req,
int *nounlock, struct sip_pvt *replaces_pvt, struct ast_channel *replaces_chan) int *nounlock, struct sip_pvt *replaces_pvt, struct ast_channel *replaces_chan)
{ {
struct ast_channel *c;
RAII_VAR(struct ast_bridge *, bridge, NULL, ao2_cleanup); RAII_VAR(struct ast_bridge *, bridge, NULL, ao2_cleanup);
RAII_VAR(struct ast_channel *, c, NULL, ao2_cleanup);
if (req->ignore) { if (req->ignore) {
return 0; return 0;
@@ -24813,7 +24813,9 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req,
ast_channel_unlock(replaces_chan); ast_channel_unlock(replaces_chan);
if (bridge) { if (bridge) {
ast_bridge_impart(bridge, c, replaces_chan, NULL, 1); if (ast_bridge_impart(bridge, c, replaces_chan, NULL, 1)) {
ast_hangup(c);
}
} else { } else {
ast_channel_move(replaces_chan, c); ast_channel_move(replaces_chan, c);
ast_hangup(c); ast_hangup(c);

2
include/asterisk/bridging.h
View File

@@ -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 * \brief Impart (non-blocking) a channel onto a bridge
* *
* \param bridge Bridge to impart on * \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 swap Channel to swap out if swapping. NULL if not swapping.
* \param features Bridge features structure. * \param features Bridge features structure.
* \param independent TRUE if caller does not want to reclaim the channel using ast_bridge_depart(). * \param independent TRUE if caller does not want to reclaim the channel using ast_bridge_depart().