From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 15 Mar 2018 17:45:17 +0000 (+0000)
Subject: [Fix] Do not allow dependencies on self
X-Git-Tag: 1.7.1~36
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=410f6688754aaca5f3b993f0781e196afcfbf66e;p=rspamd.git

[Fix] Do not allow dependencies on self
---

diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c
index 5f710d459..5db23bd66 100644
--- a/src/libserver/symbols_cache.c
+++ b/src/libserver/symbols_cache.c
@@ -413,6 +413,8 @@ rspamd_symbols_cache_post_init (struct symbols_cache *cache)
 					"%s is missing", ddep->from, ddep->to, ddep->from);
 		}
 		else {
+			msg_debug_cache ("delayed between %s(%d) -> %s", ddep->from,
+					it->id, ddep->to);
 			rspamd_symbols_cache_add_dependency (cache, it->id, ddep->to);
 		}
 
@@ -457,15 +459,24 @@ rspamd_symbols_cache_post_init (struct symbols_cache *cache)
 					dit = g_ptr_array_index (cache->items_by_id, dit->parent);
 				}
 
-				rdep = rspamd_mempool_alloc (cache->static_pool, sizeof (*rdep));
-				rdep->sym = dep->sym;
-				rdep->item = it;
-				rdep->id = i;
-				g_ptr_array_add (dit->rdeps, rdep);
-				dep->item = dit;
-				dep->id = dit->id;
-
-				msg_debug_cache ("add dependency from %d on %d", it->id, dit->id);
+				if (dit->id == i) {
+					msg_err_cache ("cannot add dependency on self: %s -> %s "
+							"(resolved to %s)",
+							it->symbol, dep->sym, dit->symbol);
+				}
+				else {
+					rdep = rspamd_mempool_alloc (cache->static_pool,
+							sizeof (*rdep));
+					rdep->sym = dep->sym;
+					rdep->item = it;
+					rdep->id = i;
+					g_ptr_array_add (dit->rdeps, rdep);
+					dep->item = dit;
+					dep->id = dit->id;
+
+					msg_debug_cache ("add dependency from %d on %d", it->id,
+							dit->id);
+				}
 			}
 			else {
 				msg_err_cache ("cannot find dependency on symbol %s", dep->sym);