summaryrefslogtreecommitdiff
path: root/res
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 11:53:16 -0500
commit028033e5a8dcf2b6d9c454786736825fe0288141 (patch)
treeffa22b11d3fe050462e5cef0d1bf70ffee69380b /res
parentf6062ac616bc266863dd78db5d9d5b578d40b53f (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')
-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 667d91ac0..cc544c01d 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);