diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-06-20 17:21:40 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-20 17:21:40 +0000 |
| commit | cd40e179a9bb01f10175ac3cecc633d631f69286 (patch) | |
| tree | f8ff825633e0ee901f3f042544f98743cbdd682b /main/features.c | |
| parent | 33eb15a242694e47707b70065c86fad19035d5c8 (diff) | |
Fix potential bridge hook resource leak if the hook install fails.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index c44520c53..ff68b06e5 100644 --- a/main/features.c +++ b/main/features.c @@ -3415,6 +3415,7 @@ static int dynamic_dtmf_hook_add(struct ast_bridge_features *features, unsigned size_t len_moh = ast_strlen_zero(moh_class) ? 0 : strlen(moh_class) + 1; size_t len_feature = strlen(feature_name) + 1; size_t len_data = sizeof(*hook_data) + len_name + len_args + len_moh + len_feature; + int res; /* Fill in application run hook data. */ hook_data = ast_malloc(len_data); @@ -3434,8 +3435,12 @@ static int dynamic_dtmf_hook_add(struct ast_bridge_features *features, unsigned } strcpy(&hook_data->app_name[hook_data->feature_offset], feature_name);/* Safe */ - return ast_bridge_dtmf_hook(features, dtmf, dynamic_dtmf_hook_trip, hook_data, + res = ast_bridge_dtmf_hook(features, dtmf, dynamic_dtmf_hook_trip, hook_data, ast_free_ptr, AST_BRIDGE_HOOK_REMOVE_ON_PULL); + if (res) { + ast_free(hook_data); + } + return res; } static int setup_dynamic_feature(void *obj, void *arg, void *data, int flags) |