From: Kako, Chang <49464540+kakochang@users.noreply.github.com>
Date: Tue, 5 May 2020 10:35:20 +0000 (+0800)
Subject: [Fix] Fix FREEMAIL_REPLYTO_NEQ_FROM_DOM
X-Git-Tag: 2.6~446^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3362%2Fhead;p=thirdparty%2Frspamd.git

[Fix] Fix FREEMAIL_REPLYTO_NEQ_FROM_DOM
---

diff --git a/rules/misc.lua b/rules/misc.lua
index 5dcf6ea050..88895c2b9c 100644
--- a/rules/misc.lua
+++ b/rules/misc.lua
@@ -345,14 +345,14 @@ rspamd_config.HAS_ATTACHMENT = {
 
 -- Requires freemail maps loaded in multimap
 local function freemail_reply_neq_from(task)
-  local frt = task:get_symbol('FREEMAIL_REPLYTO')
-  local ff  = task:get_symbol('FREEMAIL_FROM')
-  if (frt and ff and frt['options'] and ff['options'] and
-      frt['options'][1] ~= ff['options'][1])
-  then
-    return true
+  if not task:has_symbol('FREEMAIL_REPLYTO') or not task:has_symbol('FREEMAIL_FROM') then
+    return false
   end
-  return false
+  local frt = task:get_symbol('FREEMAIL_REPLYTO')
+  local ff = task:get_symbol('FREEMAIL_FROM')
+  local frt_opts = frt[1]['options']
+  local ff_opts = ff[1]['options']
+  return ( frt_opts and ff_opts and frt_opts[1] ~= ff_opts[1] )
 end
 
 rspamd_config:register_symbol({