From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 17 Jan 2017 19:19:34 +0000 (+0000)
Subject: [Fix] More fixes for iterators cleanup
X-Git-Tag: 1.5.0~314
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6eec897d8c3e01159556f41b8bb938cacfc0c084;p=rspamd.git

[Fix] More fixes for iterators cleanup
---

diff --git a/contrib/libucl/ucl_util.c b/contrib/libucl/ucl_util.c
index a26d4748d..7fcfe2e6e 100644
--- a/contrib/libucl/ucl_util.c
+++ b/contrib/libucl/ucl_util.c
@@ -2470,6 +2470,10 @@ ucl_object_iterate_reset (ucl_object_iter_t it, const ucl_object_t *obj)
 
 	UCL_SAFE_ITER_CHECK (rit);
 
+	if (rit->expl_it != NULL) {
+		UCL_FREE (sizeof (*rit->expl_it), rit->expl_it);
+	}
+
 	rit->impl_it = obj;
 	rit->expl_it = NULL;
 
@@ -2501,12 +2505,8 @@ ucl_object_iterate_full (ucl_object_iter_t it, enum ucl_iterate_type type)
 		if (ret == NULL && (type & UCL_ITERATE_IMPLICIT)) {
 			/* Need to switch to another implicit object in chain */
 			rit->impl_it = rit->impl_it->next;
-
-			if (rit->expl_it != NULL) {
-				UCL_FREE (sizeof (*rit->expl_it), rit->expl_it);
-			}
-
 			rit->expl_it = NULL;
+
 			return ucl_object_iterate_safe (it, type);
 		}
 	}