]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #3505: sandbox: must propagate file_id for includer logic
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 8 Jul 2022 17:25:43 +0000 (17:25 +0000)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 8 Jul 2022 17:25:43 +0000 (17:25 +0000)
Merge in SNORT/snort3 from ~RUCOMBS/snort3:quick_sand to master

Squashed commit of the following:

commit 94541d79e83322cf81f0bdf87b6ad7803947f024
Author: russ <rucombs@cisco.com>
Date:   Fri Jul 8 12:17:56 2022 -0400

    sandbox: must propagate file_id for includer logic

src/main/bootstrap.lua

index cc473fb5d1e58b73e4407aa8be53a97dbc86a468..c3b498405ba402ec1a6c2ded83ef7048aed94489 100644 (file)
@@ -113,6 +113,10 @@ function include(file)
         if ( sandbox_env.ips ) then
             ips = sandbox_env.ips
         end
+
+        if ( sandbox_env.file_id ) then
+            file_id = sandbox_env.file_id
+        end
     else
         dofile(fname)
     end