]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Fix] Avoid double escaping
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 13 Jan 2020 13:16:30 +0000 (13:16 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 13 Jan 2020 13:16:30 +0000 (13:16 +0000)
src/libserver/protocol.c

index 255ca50a59aa83a0563707b5b262bdac0a2e4c30..9ffdcd5c73166a492a2d5809ca7367354b60e534 100644 (file)
@@ -874,15 +874,15 @@ rspamd_protocol_extended_url (struct rspamd_task *task,
 
        obj = ucl_object_typed_new (UCL_OBJECT);
 
-       elt = ucl_object_fromlstring (encoded, enclen);
+       elt = ucl_object_fromstring_common (encoded, enclen, 0);
        ucl_object_insert_key (obj, elt, "url", 0, false);
 
        if (url->tldlen > 0) {
-               elt = ucl_object_fromlstring (url->tld, url->tldlen);
+               elt = ucl_object_fromstring_common (url->tld, url->tldlen, 0);
                ucl_object_insert_key (obj, elt, "tld", 0, false);
        }
        if (url->hostlen > 0) {
-               elt = ucl_object_fromlstring (url->host, url->hostlen);
+               elt = ucl_object_fromstring_common (url->host, url->hostlen, 0);
                ucl_object_insert_key (obj, elt, "host", 0, false);
        }
 
@@ -926,10 +926,10 @@ urls_protocol_cb (gpointer key, gpointer value, gpointer ud)
                        goffset err_offset;
 
                        if ((err_offset = rspamd_fast_utf8_validate (url->host, url->hostlen)) == 0) {
-                               obj = ucl_object_fromlstring (url->host, url->hostlen);
+                               obj = ucl_object_fromstring_common (url->host, url->hostlen, 0);
                        }
                        else {
-                               obj = ucl_object_fromlstring (url->host, err_offset - 1);
+                               obj = ucl_object_fromstring_common (url->host, err_offset - 1, 0);
                        }
                }
                else {