From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 6 Sep 2019 17:03:09 +0000 (+0100)
Subject: [Project] Lua_magic: Some tweaks
X-Git-Tag: 2.0~264
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c9af91f7ecf9d7a39ac2e07dbc7168462ab24de8;p=rspamd.git

[Project] Lua_magic: Some tweaks
---

diff --git a/lualib/lua_magic/init.lua b/lualib/lua_magic/init.lua
index 4ecc66afa..2dbd24da5 100644
--- a/lualib/lua_magic/init.lua
+++ b/lualib/lua_magic/init.lua
@@ -72,7 +72,7 @@ local function process_patterns(log_obj)
 
   if not compiled_patterns then
     for ext,pattern in pairs(patterns) do
-      assert(types[ext])
+      assert(types[ext], 'not found type: ' .. ext)
       pattern.ext = ext
       for _,match in ipairs(pattern.matches) do
         if match.string then
@@ -250,6 +250,7 @@ exports.detect = function(input, log_obj)
       return extensions[1],types[extensions[1]]
     end
 
+    -- No way, let's check data in chunks or just the whole input if it is small enough
     if #input > exports.chunk_size * 3 then
       -- Chunked version as input is too long
       local chunk1, chunk2, chunk3 =
@@ -270,7 +271,8 @@ exports.detect = function(input, log_obj)
           compiled_patterns, processed_patterns, log_obj, res)
     end
   else
-    assert(0)
+    -- Table input is NYI
+    assert(0, 'table input for match')
   end
 
   local extensions = process_detected(res)