kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 10:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

res/ari/config.c: Fix conf_alloc() object init.

Browse Source 
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
This commit is contained in:
Richard Mudgett
2015-09-25 16:48:10 -05:00
parent f6062ac616
commit 028033e5a8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/ari/config.c
View File

@@ -182,11 +182,10 @@ static void *conf_alloc(void)
if (!cfg->general) { if (!cfg->general) {
return NULL; return NULL;
} }
aco_set_defaults(&general_option, "general", cfg->general);
if (ast_string_field_init(cfg->general, 64)) { if (ast_string_field_init(cfg->general, 64)) {
return NULL; return NULL;
} }
aco_set_defaults(&general_option, "general", cfg->general);
cfg->users = ao2_container_alloc_rbtree(AO2_ALLOC_OPT_LOCK_NOLOCK, cfg->users = ao2_container_alloc_rbtree(AO2_ALLOC_OPT_LOCK_NOLOCK,
AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE, user_sort_cmp, NULL); AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE, user_sort_cmp, NULL);