diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-05-05 10:34:17 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-05-05 10:34:17 -0500 |
| commit | 250fee82aaa02c7d8be4d21cba75bf5460b32af9 (patch) | |
| tree | 6550642ed309eac6d940a4eccd3888538a0a94f7 /main | |
| parent | ce1985b09932e99361f5ee36c4c859d5b30edb93 (diff) | |
| parent | bed6c0d04b71ce404adc9a75835a5a20cbc143bd (diff) | |
Merge "app_confbridge: Fix reference to cfg in menu_template_handler" into 13
Diffstat (limited to 'main')
| -rw-r--r-- | main/config_options.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/config_options.c b/main/config_options.c index cc8e218f8..81d0ff9a0 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -588,10 +588,13 @@ enum aco_process_status aco_process_ast_config(struct aco_info *info, struct aco }; ao2_cleanup(info->internal->pending); + info->internal->pending = NULL; return ACO_PROCESS_OK; error: ao2_cleanup(info->internal->pending); + info->internal->pending = NULL; + return ACO_PROCESS_ERROR; } @@ -704,6 +707,8 @@ try_alias: end: ao2_cleanup(info->internal->pending); + info->internal->pending = NULL; + return res; } int aco_process_var(struct aco_type *type, const char *cat, struct ast_variable *var, void *obj) |