From 0a334fa2063e63c03dbd1ff5048a154b01ff055a Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 7 Jan 2016 12:53:13 +0000 Subject: [PATCH] Fix parsing of strings lists from implicit arrays --- src/libserver/cfg_rcl.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c index e01d2de0b..172bb5a90 100644 --- a/src/libserver/cfg_rcl.c +++ b/src/libserver/cfg_rcl.c @@ -2531,12 +2531,16 @@ rspamd_rcl_parse_struct_string_list (rspamd_mempool_t *pool, const ucl_object_t *cur; const gsize num_str_len = 32; ucl_object_iter_t iter = NULL; - gboolean is_hash; + gboolean is_hash, need_destructor = TRUE; is_hash = pd->flags & RSPAMD_CL_FLAG_STRING_LIST_HASH; target = (gpointer *)(((gchar *)pd->user_struct) + pd->offset); + if (!is_hash && *target != NULL) { + need_destructor = FALSE; + } + iter = ucl_object_iterate_new (obj); while ((cur = ucl_object_iterate_safe (iter, true)) != NULL) { @@ -2586,13 +2590,14 @@ rspamd_rcl_parse_struct_string_list (rspamd_mempool_t *pool, return FALSE; } - /* Add a destructor */ - if (!is_hash && *target != NULL) { *target = g_list_reverse (*target); - rspamd_mempool_add_destructor (pool, - (rspamd_mempool_destruct_t) g_list_free, - *target); + + if (need_destructor) { + rspamd_mempool_add_destructor (pool, + (rspamd_mempool_destruct_t) g_list_free, + *target); + } } return TRUE; -- 2.39.5