kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@29702 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-23 16:01:16 +00:00
parent ebfd515ca7
commit cfd6e75c53
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_features.c
View File

@@ -1433,6 +1433,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
featurecode = peer_featurecode; featurecode = peer_featurecode;
} }
featurecode[strlen(featurecode)] = f->subclass; featurecode[strlen(featurecode)] = f->subclass;
/* Get rid of the frame before we start doing "stuff" with the channels */
ast_frfree(f);
f = NULL;
config->feature_timer = backup_config.feature_timer; config->feature_timer = backup_config.feature_timer;
res = ast_feature_interpret(chan, peer, config, featurecode, sense); res = ast_feature_interpret(chan, peer, config, featurecode, sense);
switch(res) { switch(res) {
@@ -1445,10 +1448,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
} }
if (res >= FEATURE_RETURN_PASSDIGITS) { if (res >= FEATURE_RETURN_PASSDIGITS) {
res = 0; res = 0;
} else { } else
ast_frfree(f);
break; break;
}
hasfeatures = !ast_strlen_zero(chan_featurecode) || !ast_strlen_zero(peer_featurecode); hasfeatures = !ast_strlen_zero(chan_featurecode) || !ast_strlen_zero(peer_featurecode);
if (hadfeatures && !hasfeatures) { if (hadfeatures && !hasfeatures) {
/* Restore backup */ /* Restore backup */