From: Miecio Za <miecio@miecio.net>
Date: Mon, 18 Mar 2019 19:38:23 +0000 (+0100)
Subject: [Minor] Fix leaks and hash usage for is_utf_outside_range
X-Git-Tag: 1.9.1~87^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=925b1b072360e12f68a0992d3bdcb360c35f7663;p=thirdparty%2Frspamd.git

[Minor] Fix leaks and hash usage for is_utf_outside_range

Fix memory leaks on checker errors and fix hash usage to
use proper hash/compare functions
---

diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index 7c98a0989e..0a1fc20104 100644
--- a/src/lua/lua_util.c
+++ b/src/lua/lua_util.c
@@ -2543,13 +2543,13 @@ lua_util_is_utf_outside_range(lua_State *L)
 	static rspamd_lru_hash_t *validators;
 
 	if (validators == NULL) {
-		validators = rspamd_lru_hash_new(16, g_free, (GDestroyNotify)uspoof_close);
+		validators = rspamd_lru_hash_new_full(16, g_free, (GDestroyNotify)uspoof_close, g_int64_hash, g_int64_equal);
 	}
 
 	if (string_to_check) {
 		guint64 hash_key = (guint64)range_end << 32 || range_start;
 
-		USpoofChecker *validator = rspamd_lru_hash_lookup(validators, &hash_key, time(NULL));
+		USpoofChecker *validator = rspamd_lru_hash_lookup(validators, &hash_key, 0);
 
 		UErrorCode uc_err = U_ZERO_ERROR;
 
@@ -2563,6 +2563,7 @@ lua_util_is_utf_outside_range(lua_State *L)
 				msg_err ("cannot init spoof checker: %s", u_errorName (uc_err));
 				lua_pushboolean (L, false);
 				uspoof_close(validator);
+				g_free(creation_hash_key);
 				return 1;
 			}
 
@@ -2579,10 +2580,11 @@ lua_util_is_utf_outside_range(lua_State *L)
 				msg_err ("Cannot configure uspoof: %s", u_errorName (uc_err));
 				lua_pushboolean (L, false);
 				uspoof_close(validator);
+				g_free(creation_hash_key);
 				return 1;
 			}
 
-			rspamd_lru_hash_insert(validators, creation_hash_key, validator, time(NULL), 0);
+			rspamd_lru_hash_insert(validators, creation_hash_key, validator, 0, 0);
 		}
 
 		ret = uspoof_checkUTF8 (validator, string_to_check, len_of_string, NULL, &uc_err);