diff options
| -rw-r--r-- | funcs/func_odbc.c | 2 | ||||
| -rw-r--r-- | main/config_options.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 5785441ec..a8f2c8d0b 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -793,6 +793,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha if (!(resultset = ast_calloc(1, sizeof(*resultset)))) { pbx_builtin_setvar_helper(chan, "ODBCROWS", rowcount); pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status); + AST_RWLIST_UNLOCK(&queries); ast_autoservice_stop(chan); return -1; } @@ -809,6 +810,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha if (!(resultset = ast_calloc(1, sizeof(*resultset)))) { pbx_builtin_setvar_helper(chan, "ODBCROWS", rowcount); pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status); + AST_RWLIST_UNLOCK(&queries); ast_autoservice_stop(chan); return -1; } diff --git a/main/config_options.c b/main/config_options.c index d837cd19f..3ac5590ec 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -616,7 +616,7 @@ enum aco_process_status aco_process_ast_config(struct aco_info *info, struct aco { if (!info->internal) { ast_log(LOG_ERROR, "Attempt to process %s with uninitialized aco_info\n", file->filename); - goto error; + return ACO_PROCESS_ERROR; } if (!(info->internal->pending = info->snapshot_alloc())) { |