summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2018-01-04 14:00:43 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-01-04 14:00:43 -0600
commitf33ed0d24755daa8e5c842770d39c55f6ce323e7 (patch)
tree9ec97ab9cba66ab05522f818a8004561ca9fbaa7
parent8187bde9bf3482b7457c10ec98dcf8fc3ab86714 (diff)
parentaaed0b8b3a769d24dd9a86e819aa557fa647b78f (diff)
Merge "aco: Fix NULL dereference in error path."
-rw-r--r--main/config_options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/config_options.c b/main/config_options.c
index a3ec7b052..3aa00f921 100644
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -614,7 +614,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())) {