Merged revisions 29696 via svnmerge from
authorBJ Weschke <bweschke@btwtech.com>
Tue, 23 May 2006 16:37:40 +0000 (16:37 +0000)
committerBJ Weschke <bweschke@btwtech.com>
Tue, 23 May 2006 16:37:40 +0000 (16:37 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r29696 | bweschke | 2006-05-23 11:58:24 -0400 (Tue, 23 May 2006) | 3 lines

 Fix a potential leak and correct (hopefully) a segfault under certain conditions. #6784 (vovan and perry testing)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29706 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_features.c

index 9596e1f..54c9a4c 100644 (file)
@@ -1363,6 +1363,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                         * \todo XXX how do we guarantee the latter ?
                         */
                        featurecode[strlen(featurecode)] = f->subclass;
                         * \todo XXX how do we guarantee the latter ?
                         */
                        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) {
                        config->feature_timer = backup_config.feature_timer;
                        res = ast_feature_interpret(chan, peer, config, featurecode, sense);
                        switch(res) {
@@ -1375,10 +1378,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                        }
                        if (res >= FEATURE_RETURN_PASSDIGITS) {
                                res = 0;
                        }
                        if (res >= FEATURE_RETURN_PASSDIGITS) {
                                res = 0;
-                       } else {
-                               ast_frfree(f);
+                       } else 
                                break;
                                break;
-                       }
                        hasfeatures = !ast_strlen_zero(chan_featurecode) || !ast_strlen_zero(peer_featurecode);
                        if (hadfeatures && !hasfeatures) {
                                /* Restore backup */
                        hasfeatures = !ast_strlen_zero(chan_featurecode) || !ast_strlen_zero(peer_featurecode);
                        if (hadfeatures && !hasfeatures) {
                                /* Restore backup */