From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 16 Sep 2017 17:09:53 +0000 (+0100)
Subject: [Minor] Fix some warnings
X-Git-Tag: 1.7.0~637
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9942f8612540643141087a20ef2875becbe4c3d;p=thirdparty%2Frspamd.git

[Minor] Fix some warnings
---

diff --git a/src/plugins/lua/fann_redis.lua b/src/plugins/lua/fann_redis.lua
index f7ec65d30c..e2a7eb4f53 100644
--- a/src/plugins/lua/fann_redis.lua
+++ b/src/plugins/lua/fann_redis.lua
@@ -367,7 +367,7 @@ local function fann_scores_filter(task)
       id = id .. r
     end
 
-    if fanns[id].fann then
+    if fanns[id] and fanns[id].fann then
       local fann_data = task:get_symbols_tokens()
       local mt = meta_functions.rspamd_gen_metatokens(task)
       -- Add filtered meta tokens
@@ -1093,13 +1093,13 @@ else
   local function override_defaults(def, override)
     for k,v in pairs(override) do
       if def[k] then
-        if type(override[k]) == 'table' then
-          override_defaults(def[k], override[k])
+        if type(v) == 'table' then
+          override_defaults(def[k], v)
         else
-          def[k] = override[k]
+          def[k] = v
         end
       else
-        def[k] = override[k]
+        def[k] = v
       end
     end
   end