From 90b97eddc49374564100b453f73fb3ee0a8e418c Mon Sep 17 00:00:00 2001 From: David Vossel Date: Thu, 19 Mar 2009 20:32:20 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@183437 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 2 +- include/asterisk/features.h | 6 +++++- main/features.c | 7 +------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/app_dial.c b/apps/app_dial.c index fa82e9dee8..d71141edb4 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -869,7 +869,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, static int detect_disconnect(struct ast_channel *chan, char code, struct ast_str *featurecode) { struct ast_flags features = { AST_FEATURE_DISCONNECT }; /* only concerned with disconnect feature */ - struct ast_call_feature feature; + struct ast_call_feature feature = { 0, }; int res; ast_str_append(&featurecode, 1, "%c", code); diff --git a/include/asterisk/features.h b/include/asterisk/features.h index 13d9ae1e12..f266f9943d 100644 --- a/include/asterisk/features.h +++ b/include/asterisk/features.h @@ -117,7 +117,11 @@ void ast_register_feature(struct ast_call_feature *feature); void ast_unregister_feature(struct ast_call_feature *feature); /*! \brief detect a feature before bridging - \para chan, ast_flags ptr, code, ast_call_feature ptr to be set if found */ + \param chan + \param ast_flags ptr + \param char ptr of input code + \retval ast_call_feature ptr to be set if found + \return result, was feature found or not */ int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, char *code, struct ast_call_feature *feature); /*! \brief look for a call feature entry by its sname diff --git a/main/features.c b/main/features.c index ce94f8f10e..823e95803f 100644 --- a/main/features.c +++ b/main/features.c @@ -1841,12 +1841,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)