summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2018-01-04 14:08:29 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-01-04 14:08:29 -0600
commiteb8a36d961041b015d848c843b00a875a65be7fb (patch)
tree4a35f147b57634604ae67e5f5dd1aabcc970943a
parent74b6fafbe63c5facb0813002194af13d05b58843 (diff)
parentec745705983373e6048aa7534b1b24915917a6ae (diff)
Merge "aco: Fix NULL dereference in error path." into 13
-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 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())) {