]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] Fix FREEMAIL_REPLYTO_NEQ_FROM_DOM 3362/head
authorKako, Chang <49464540+kakochang@users.noreply.github.com>
Tue, 5 May 2020 10:35:20 +0000 (18:35 +0800)
committerGitHub <noreply@github.com>
Tue, 5 May 2020 10:35:20 +0000 (18:35 +0800)
rules/misc.lua

index 5dcf6ea0501c432ddae0beed96a2bdb44fc78afd..88895c2b9c1c11fbe4ef8de4fc5046b775724d7f 100644 (file)
@@ -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({