From: Andrew Lewis <nerf@judo.za.org>
Date: Wed, 17 Jan 2018 16:41:44 +0000 (+0200)
Subject: [Minor] CHECK_FROM rule: avoid indexing of nil
X-Git-Tag: 1.7.0~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97ab1a1a08ce9eb644adea17943d60582918a13d;p=thirdparty%2Frspamd.git

[Minor] CHECK_FROM rule: avoid indexing of nil
---

diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua
index 1f5d77b2cf..e9f26117e9 100644
--- a/rules/headers_checks.lua
+++ b/rules/headers_checks.lua
@@ -596,11 +596,11 @@ local check_from_id = rspamd_config:register_symbol{
     then
       task:insert_result('FROM_EQ_ENVFROM', 1.0)
     elseif (envfrom and envfrom[1] and envfrom[1].addr) then
-      task:insert_result('FROM_NEQ_ENVFROM', 1.0, from and from[1].addr or '', envfrom[1].addr)
+      task:insert_result('FROM_NEQ_ENVFROM', 1.0, ((from or E)[1] or E).addr or '', envfrom[1].addr)
     end
 
     local to = task:get_recipients(2)
-    if not (to and to[1] and #to == 1 and from) then return false end
+    if not (to and to[1] and #to == 1 and from and from[1]) then return false end
     -- Check if FROM == TO
     if (util.strequal_caseless(to[1].addr, from[1].addr)) then
       task:insert_result('TO_EQ_FROM', 1.0)