commit b20521f: [Minor] Lua_content: Fix hang

Vsevolod Stakhov vsevolod at highsecure.ru
Mon Jan 13 17:07:06 UTC 2020


Author: Vsevolod Stakhov
Date: 2020-01-13 17:05:07 +0000
URL: https://github.com/rspamd/rspamd/commit/b20521fd4e5a57b1b27f021f77f0e0dfbf8c9731 (HEAD -> master)

[Minor] Lua_content: Fix hang

---
 lualib/lua_content/pdf.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lualib/lua_content/pdf.lua b/lualib/lua_content/pdf.lua
index 741c011bd..516eb8be2 100644
--- a/lualib/lua_content/pdf.lua
+++ b/lualib/lua_content/pdf.lua
@@ -54,7 +54,7 @@ local pdf_patterns = {
   },
   start_object = {
     patterns = {
-      [=[[\r\n]\s*\d+ \d+ obj[\r\n]]=]
+      [=[[\r\n\0]\s*\d+ \d+ obj[\r\n]]=]
     }
   },
   end_object = {
@@ -517,7 +517,10 @@ local function postprocess_pdf_objects(task, input, pdf)
       obj_count = obj_count + 1
       start_pos = start_pos + 1
       end_pos = end_pos + 1
-    elseif start_pos > end_pos then
+    elseif first > last then
+      end_pos = end_pos + 1
+    else
+      start_pos = start_pos + 1
       end_pos = end_pos + 1
     end
   end


More information about the Commits mailing list