Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 18:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Re-instantiate providing location information to LoadFile hooks.

Browse source 
#1835 subtly changed the semantics of the `LoadFile` plugin hook to no
longer have the current script location available for signature files
being loaded through `@load-sigs`. This was undocumented behavior, so
it's technically not a regression, but since at least one external
plugin is depending on it, this change restores the old behavior.
This commit is contained in:
Robin Sommer 2022-04-14 09:54:45 +02:00
parent d29160e9de
commit fccb9ccab0
No known key found for this signature in database
GPG key ID: 6BEDA4DA6B8B23E3
8 changed files with 66 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ScannedFile.h
View file

@ -2,6 +2,7 @@
#pragma once
#include <zeek/Obj.h>
#include <list>
#include <optional>
#include <string>
@ -40,9 +41,10 @@ struct SignatureFile
{
std::string file;
std::optional<std::string> full_path;
Location load_location;
SignatureFile(std::string file);
SignatureFile(std::string file, std::string full_path);
SignatureFile(std::string file, std::string full_path, Location load_location);
};
extern std::vector<SignatureFile> sig_files;