From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 22 Oct 2019 10:35:22 +0000 (+0100)
Subject: [Minor] Lua_url: Another fix for emails to string
X-Git-Tag: 2.1~49
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86fb42c53e463bf158525915fc18468f991baeea;p=rspamd.git

[Minor] Lua_url: Another fix for emails to string
---

diff --git a/src/lua/lua_url.c b/src/lua/lua_url.c
index bd79c1697..57be4c009 100644
--- a/src/lua/lua_url.c
+++ b/src/lua/lua_url.c
@@ -302,12 +302,20 @@ lua_url_tostring (lua_State *L)
 
 	if (url != NULL && url->url != NULL) {
 		if (url->url->protocol == PROTOCOL_MAILTO) {
-			if (url->url->userlen + 1 + url->url->hostlen <= url->url->urllen) {
-				lua_pushlstring (L, url->url->user,
-						url->url->userlen + 1 + url->url->hostlen);
+			if (url->url->userlen + 1 + url->url->hostlen == url->url->urllen) {
+				lua_pushlstring (L, url->url->string, url->url->urllen);
 			}
 			else {
-				lua_pushlstring (L, url->url->string, url->url->urllen);
+				/* TODO: not efficient */
+				gchar *tmp = g_malloc (url->url->userlen + 1 +
+						url->url->hostlen);
+				memcpy (tmp, url->url->user, url->url->userlen);
+				tmp[url->url->userlen] = '@';
+				memcpy (tmp + url->url->userlen + 1, url->url->host,
+						url->url->hostlen);
+
+				lua_pushlstring (L, tmp, url->url->userlen + 1 + url->url->hostlen);
+				g_free (tmp);
 			}
 		}
 		else {