]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Fix] Try harder to find urls
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 8 Aug 2017 07:20:34 +0000 (08:20 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 8 Aug 2017 07:20:34 +0000 (08:20 +0100)
src/libserver/url.c

index 35e704f67d364012d1a41e79d0c2227ac2613868..8370b8d9945c5cd8b5bd89cb0771f114e5d9d5a2 100644 (file)
@@ -1895,8 +1895,10 @@ url_web_start (struct url_callback_data *cb,
                (g_ascii_strncasecmp (pos, "www", 3) == 0 ||
                 g_ascii_strncasecmp (pos, "ftp", 3) == 0)) {
 
-               if (!is_url_start (*(pos - 1)) && !g_ascii_isspace (*(pos - 1)) &&
-                               pos - 1 != match->prev_newline_pos) {
+               if (!(is_url_start (*(pos - 1)) ||
+                               g_ascii_isspace (*(pos - 1)) ||
+                               pos - 1 == match->prev_newline_pos ||
+                               (*(pos - 1) & 0x80))) { /* Chinese trick */
                        return FALSE;
                }
        }