summaryrefslogtreecommitdiff
path: root/res/ari
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2015-09-25 16:48:10 -0500
committerRichard Mudgett <rmudgett@digium.com>2015-09-29 12:10:45 -0500
commitaa00df62ee8706db4a64b3591f15e2e19a136d09 (patch)
treefa313394a1de7ab97fda29cf0b90d2e9eaa8a702 /res/ari
parent2d7a4a3357cbaea7acd8fb202c28512980508c88 (diff)
res/ari/config.c: Fix conf_alloc() object init.
Need to finish initializing the string fields in the ao2 object before putting any default strings into them. ASTERISK-25383 #close Reported by: yaron nahum Change-Id: I9f7f3a03f0c4991a01593abf8697b9a587c0ea84
Diffstat (limited to 'res/ari')
-rw-r--r--res/ari/config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/res/ari/config.c b/res/ari/config.c
index e2d5b1c0a..6d2a67954 100644
--- a/res/ari/config.c
+++ b/res/ari/config.c
@@ -182,11 +182,10 @@ static void *conf_alloc(void)
if (!cfg->general) {
return NULL;
}
- aco_set_defaults(&general_option, "general", cfg->general);
-
if (ast_string_field_init(cfg->general, 64)) {
return NULL;
}
+ aco_set_defaults(&general_option, "general", cfg->general);
cfg->users = ao2_container_alloc_rbtree(AO2_ALLOC_OPT_LOCK_NOLOCK,
AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE, user_sort_cmp, NULL);