diff options
| author | David Vossel <dvossel@digium.com> | 2009-03-19 20:30:39 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-03-19 20:30:39 +0000 |
| commit | 9d3527bddfea1aaa520090b663f64c5eebe87d75 (patch) | |
| tree | bfe69fbdaeb29e969aba52d6d5974a905a327c1b /main | |
| parent | 95f24283ca733cbd7c6db1c02dad838660584574 (diff) | |
Merged revisions 183386 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r183386 | dvossel | 2009-03-19 14:40:07 -0500 (Thu, 19 Mar 2009) | 6 lines
Cleaning up a few things in detect disconnect patch
Initialized ast_call_feature in detect_disconnect to avoid accessing uninitialized memory. Cleaned up /param tags in features.h. No longer send dynamic features in ast_feature_detect.
issue #11583
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@183436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/features.c b/main/features.c index 2f0b07b7a..0b6d7f53c 100644 --- a/main/features.c +++ b/main/features.c @@ -2110,12 +2110,7 @@ static int feature_interpret(struct ast_channel *chan, struct ast_channel *peer, int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, char *code, struct ast_call_feature *feature) { - char *dynamic_features; - ast_channel_lock(chan); - dynamic_features = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "DYNAMIC_FEATURES"),"")); - ast_channel_unlock(chan); - - return feature_interpret_helper(chan, NULL, NULL, code, 0, dynamic_features, features, 0, feature); + return feature_interpret_helper(chan, NULL, NULL, code, 0, NULL, features, 0, feature); } static void set_config_flags(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config) |