From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 27 Sep 2019 14:52:28 +0000 (+0100)
Subject: [Fix] Do not count images urls when checking url regexps for compatibility
X-Git-Tag: 2.0~103
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dfbcf2c23fba345278eb75b77e64938bec4d439d;p=rspamd.git

[Fix] Do not count images urls when checking url regexps for compatibility
---

diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c
index 592cc31d4..617322926 100644
--- a/src/libserver/re_cache.c
+++ b/src/libserver/re_cache.c
@@ -1137,15 +1137,17 @@ rspamd_re_cache_exec_re (struct rspamd_task *task,
 			lenvec = g_malloc (sizeof (*lenvec) * cnt);
 			g_hash_table_iter_init (&it, MESSAGE_FIELD (task, urls));
 			i = 0;
+			raw = FALSE;
 
 			while (g_hash_table_iter_next (&it, &k, &v)) {
 				url = v;
 				in = url->string;
 				len = url->urllen;
-				raw = FALSE;
 
-				scvec[i] = (guchar *)in;
-				lenvec[i++] = len;
+				if (len > 0 && !(url->flags & RSPAMD_URL_FLAG_IMAGE)) {
+					scvec[i] = (guchar *) in;
+					lenvec[i++] = len;
+				}
 			}
 
 			g_hash_table_iter_init (&it, MESSAGE_FIELD (task, emails));
@@ -1154,14 +1156,13 @@ rspamd_re_cache_exec_re (struct rspamd_task *task,
 				url = v;
 				in = url->string;
 				len = url->urllen;
-				raw = FALSE;
 
-				scvec[i] = (guchar *) in;
-				lenvec[i++] = len;
+				if (len > 0 && !(url->flags & RSPAMD_URL_FLAG_IMAGE)) {
+					scvec[i] = (guchar *) in;
+					lenvec[i++] = len;
+				}
 			}
 
-			g_assert (i == cnt);
-
 			ret = rspamd_re_cache_process_regexp_data (rt, re,
 					task, scvec, lenvec, i, raw);
 			msg_debug_re_task ("checking url regexp: %s -> %d",