diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-19 20:33:19 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-19 20:33:19 +0000 |
| commit | 6e2a49538d79da77d43e73d9edfb3848f36de5e3 (patch) | |
| tree | 753d121276d6eb04518a5594b939641e6b3d9a66 /main/features.c | |
| parent | 4816f49f0dfa87d2ffeb06c5eb30b9e29d2d3e1e (diff) | |
Merged revisions 183436 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r183436 | dvossel | 2009-03-19 15:30:39 -0500 (Thu, 19 Mar 2009) | 13 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@183438 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -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 dd8aed30b..e0461dbb1 100644 --- a/main/features.c +++ b/main/features.c @@ -2041,12 +2041,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p 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) |