From 4de471ec12681ce99950e929f39a911473ceb4b6 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 22 Oct 2018 16:21:29 +0100
Subject: [PATCH] [Minor] More fixes to the internal modules

---
 src/plugins/dkim_check.c | 13 +++++++++++++
 src/plugins/surbl.c      |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index 9475164a1..f1a67085e 100644
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -1298,6 +1298,7 @@ dkim_sign_callback (struct rspamd_task *task,
 					msg_err_task ("invalid return value from sign condition: %e",
 							err);
 					g_error_free (err);
+					rspamd_symbols_cache_finalize_item (task, item);
 
 					return;
 				}
@@ -1320,6 +1321,7 @@ dkim_sign_callback (struct rspamd_task *task,
 						lua_settop (L, 0);
 						luaL_error (L, "unknown key type: %s",
 								key_type);
+						rspamd_symbols_cache_finalize_item (task, item);
 
 						return;
 					}
@@ -1334,6 +1336,7 @@ dkim_sign_callback (struct rspamd_task *task,
 						if (arc_idx == 0) {
 							lua_settop (L, 0);
 							luaL_error (L, "no arc idx specified");
+							rspamd_symbols_cache_finalize_item (task, item);
 
 							return;
 						}
@@ -1343,12 +1346,14 @@ dkim_sign_callback (struct rspamd_task *task,
 						if (arc_cv == NULL) {
 							lua_settop (L, 0);
 							luaL_error (L, "no arc cv specified");
+							rspamd_symbols_cache_finalize_item (task, item);
 
 							return;
 						}
 						if (arc_idx == 0) {
 							lua_settop (L, 0);
 							luaL_error (L, "no arc idx specified");
+							rspamd_symbols_cache_finalize_item (task, item);
 
 							return;
 						}
@@ -1357,6 +1362,7 @@ dkim_sign_callback (struct rspamd_task *task,
 						lua_settop (L, 0);
 						luaL_error (L, "unknown sign type: %s",
 								sign_type_str);
+						rspamd_symbols_cache_finalize_item (task, item);
 
 						return;
 					}
@@ -1389,6 +1395,7 @@ dkim_sign_callback (struct rspamd_task *task,
 						msg_err_task ("cannot load dkim key %s: %e",
 								lru_key, err);
 						g_error_free (err);
+						rspamd_symbols_cache_finalize_item (task, item);
 
 						return;
 					}
@@ -1413,6 +1420,7 @@ dkim_sign_callback (struct rspamd_task *task,
 						msg_err_task ("cannot load dkim key %s: %e",
 								lru_key, err);
 						g_error_free (err);
+						rspamd_symbols_cache_finalize_item (task, item);
 
 						return;
 					}
@@ -1432,6 +1440,7 @@ dkim_sign_callback (struct rspamd_task *task,
 					msg_err_task ("cannot create sign context: %e",
 							err);
 					g_error_free (err);
+					rspamd_symbols_cache_finalize_item (task, item);
 
 					return;
 				}
@@ -1459,9 +1468,13 @@ dkim_sign_callback (struct rspamd_task *task,
 		if (!sign) {
 			msg_debug_task ("skip signing as dkim condition callback returned"
 					" false");
+			rspamd_symbols_cache_finalize_item (task, item);
+
 			return;
 		}
 	}
+
+	rspamd_symbols_cache_finalize_item (task, item);
 }
 
 struct rspamd_dkim_lua_verify_cbdata {
diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index e2bf97703..52bfe42ca 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -1910,6 +1910,8 @@ surbl_test_url (struct rspamd_task *task,
 		param->tree);
 	g_hash_table_foreach (task->urls, surbl_tree_url_callback, param);
 
+	rspamd_symcache_item_async_inc (task, item);
+
 	/* We also need to check and process img URLs */
 	if (suffix->options & SURBL_OPTION_CHECKIMAGES) {
 		for (i = 0; i < task->text_parts->len; i ++) {
@@ -1971,9 +1973,13 @@ surbl_test_redirector (struct rspamd_task *task,
 	struct surbl_ctx *surbl_module_ctx = surbl_get_context (task->cfg);
 
 	if (!surbl_module_ctx->use_redirector || !surbl_module_ctx->redirector_tlds) {
+		rspamd_symbols_cache_finalize_item (task, item);
+
 		return;
 	}
 
+	rspamd_symcache_item_async_inc (task, item);
+
 	param = rspamd_mempool_alloc0 (task->task_pool, sizeof (*param));
 	param->task = task;
 	param->suffix = NULL;
-- 
2.39.5