From aa00df62ee8706db4a64b3591f15e2e19a136d09 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 25 Sep 2015 16:48:10 -0500 Subject: [PATCH] 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 --- res/ari/config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/ari/config.c b/res/ari/config.c index e2d5b1c0ab..6d2a679545 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); -- 2.47.2