diff options
| author | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-23 15:58:24 +0000 |
|---|---|---|
| committer | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-23 15:58:24 +0000 |
| commit | 398097da5064c5b7fe408eb4ff4b5896df83d9f4 (patch) | |
| tree | 99ef34e7d57cc76b739686080d7d09576697723a | |
| parent | f9781942fb3fa0b44ff91f3a57e2b7556bf3ed54 (diff) | |
Fix a potential leak and correct (hopefully) a segfault under certain conditions. #6784 (vovan and perry testing)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@29696 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/res_features.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/res/res_features.c b/res/res_features.c index 30c00db27..885f4a7d7 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1433,6 +1433,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast featurecode = peer_featurecode; } 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; res = ast_feature_interpret(chan, peer, config, featurecode, sense); 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) { res = 0; - } else { - ast_frfree(f); + } else break; - } hasfeatures = !ast_strlen_zero(chan_featurecode) || !ast_strlen_zero(peer_featurecode); if (hadfeatures && !hasfeatures) { /* Restore backup */ |