From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 2 Dec 2015 17:16:14 +0000 (+0000)
Subject: Fix parsing of url encoded href tags
X-Git-Tag: 1.1.0~430
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ece601117f3aeb020faf80a307d54ef356411bd0;p=thirdparty%2Frspamd.git

Fix parsing of url encoded href tags
---

diff --git a/src/libserver/html.c b/src/libserver/html.c
index 45eeb8e4a4..29922b1333 100644
--- a/src/libserver/html.c
+++ b/src/libserver/html.c
@@ -1285,7 +1285,9 @@ rspamd_html_process_url_tag (rspamd_mempool_t *pool, struct html_tag *tag)
 	struct rspamd_url *url;
 	GList *cur;
 	const guchar *p;
+	gchar *decoded;
 	gint rc;
+	gsize decoded_len;
 	gboolean has_spaces = FALSE;
 
 	cur = tag->params->head;
@@ -1313,8 +1315,13 @@ rspamd_html_process_url_tag (rspamd_mempool_t *pool, struct html_tag *tag)
 				has_spaces = TRUE;
 			}
 
+			/* Also we need to perform url decode */
+			decoded = rspamd_mempool_alloc (pool, comp->len + 1);
+			rspamd_strlcpy (decoded, comp->start, comp->len + 1);
+			decoded_len = rspamd_decode_url (decoded, comp->start, comp->len);
+
 			url = rspamd_mempool_alloc (pool, sizeof (*url));
-			rc = rspamd_url_parse (url, (gchar *)comp->start, comp->len, pool);
+			rc = rspamd_url_parse (url, decoded, decoded_len, pool);
 
 			if (rc == URI_ERRNO_OK) {