Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/vern/opt-skip-file-fix'

Browse source 
* origin/topic/vern/opt-skip-file-fix:
  fixed bug in logic for including/excluding files for script optimization
This commit is contained in:
Tim Wojtulewicz 2025-09-30 20:12:14 +00:00
commit 63291eca75
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
8.1.0-dev.617 | 2025-09-30 20:12:14 +0000
* fixed bug in logic for including/excluding files for script optimization (Vern Paxson, Corelight)
8.1.0-dev.615 | 2025-09-30 19:12:05 +0000 8.1.0-dev.615 | 2025-09-30 19:12:05 +0000
* Remove checks for OpenSSL 1.x versions (Tim Wojtulewicz, Corelight) * Remove checks for OpenSSL 1.x versions (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.1.0-dev.615 8.1.0-dev.617

7
src/script_opt/ScriptOpt.cc
View file

@ -160,15 +160,18 @@ AnalyzeDecision filename_matches_opt_files(const char* filename) {
auto fin = util::detail::normalize_path(filename); auto fin = util::detail::normalize_path(filename);
for ( auto& s : analysis_options.skip_files ) for ( auto& s : sfiles )
if ( std::regex_match(fin, s) ) if ( std::regex_match(fin, s) )
return AnalyzeDecision::SHOULD_NOT; return AnalyzeDecision::SHOULD_NOT;
if ( ofiles.empty() )
return AnalyzeDecision::DEFAULT;
for ( auto& o : ofiles ) for ( auto& o : ofiles )
if ( std::regex_match(fin, o) ) if ( std::regex_match(fin, o) )
return AnalyzeDecision::SHOULD; return AnalyzeDecision::SHOULD;
return AnalyzeDecision::DEFAULT; return AnalyzeDecision::SHOULD_NOT;
} }
AnalyzeDecision obj_matches_opt_files(const Obj* obj) { AnalyzeDecision obj_matches_opt_files(const Obj* obj) {