aboutsummaryrefslogtreecommitdiffstats
path: root/src/libserver/url.c
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-05-12 14:42:50 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2016-05-12 14:42:50 +0100
commit9dc7bf904bf62b332cfd5a0a99a195cef19149d7 (patch)
tree48a17e364fc16d6be5e9501f5639eea99b2774e9 /src/libserver/url.c
parent7373423937593c5781bef430e4a17856ea3f75bc (diff)
downloadrspamd-9dc7bf904bf62b332cfd5a0a99a195cef19149d7.tar.gz
rspamd-9dc7bf904bf62b332cfd5a0a99a195cef19149d7.zip
[Fix] Try to fix false positive URL detections in text parts
Diffstat (limited to 'src/libserver/url.c')
-rw-r--r--src/libserver/url.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libserver/url.c b/src/libserver/url.c
index fe70585be..70a5f3c9b 100644
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -1795,10 +1795,9 @@ url_tld_end (struct url_callback_data *cb,
{
const gchar *p;
- /* A url must be finished by tld, so it must be followed by space character */
p = pos + match->m_len;
- if (p == cb->end || g_ascii_isspace (*p) || *p == ',') {
+ if (p == cb->end) {
match->m_len = p - match->m_begin;
return TRUE;
}
@@ -2302,7 +2301,7 @@ rspamd_url_text_extract (rspamd_mempool_t *pool,
{
struct rspamd_url_mimepart_cbdata mcbd;
- if (part->content == NULL || part->content->len == 0) {
+ if (part->stripped_content == NULL || part->stripped_content->len == 0) {
msg_warn_task ("got empty text part");
return;
}
@@ -2310,8 +2309,8 @@ rspamd_url_text_extract (rspamd_mempool_t *pool,
mcbd.task = task;
mcbd.part = part;
- rspamd_url_find_multiple (task->task_pool, part->content->data,
- part->content->len, is_html,
+ rspamd_url_find_multiple (task->task_pool, part->stripped_content->data,
+ part->stripped_content->len, is_html,
rspamd_url_text_part_callback, &mcbd);
/* Handle offsets of this part */