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 branch 'topic/bbannier/coverity'

Browse source
This commit is contained in:
Benjamin Bannier 2025-01-14 08:42:27 +01:00
commit 300b3788e2
5 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
7.2.0-dev.82 | 2025-01-14 08:42:27 +0100
* Bump auxil/spicy to latest development snapshot (Benjamin Bannier, Corelight)
* Prevent copies in various places (Benjamin Bannier, Corelight)
7.2.0-dev.79 | 2025-01-13 08:30:54 -0700
* Fix incomplete includes in Spicy SSL analyer C++ code (Benjamin Bannier, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.2.0-dev.79
7.2.0-dev.82

2
auxil/spicy

@ -1 +1 @@
Subproject commit 5f1e39698d8b2e16ae860620e82adb281d500017
Subproject commit 651c6b160abaee58f3b379d4737431882af94fe0

2
src/spicy/spicyz/driver.cc
View file

@ -93,7 +93,7 @@ Driver::Driver(std::unique_ptr<GlueCompiler> glue, const char* argv0, hilti::rt:
// We make our search paths relative to the plugin library, so that the
// plugin installation can move around.
options.library_paths.push_back(lib_path);
options.library_paths.push_back(std::move(lib_path));
} catch ( const hilti::rt::filesystem::filesystem_error& e ) {
::hilti::logger().warning(
hilti::util::fmt("invalid plugin base directory %s: %s", lib_path.native(), e.what()));

14
src/spicy/spicyz/glue-compiler.cc
View file

@ -479,19 +479,19 @@ bool GlueCompiler::loadEvtFile(hilti::rt::filesystem::path& path) {
if ( looking_at(*chunk, 0, "protocol") ) {
auto a = parseProtocolAnalyzer(*chunk);
SPICY_DEBUG(hilti::util::fmt(" Got protocol analyzer definition for %s", a.name));
_protocol_analyzers.push_back(a);
_protocol_analyzers.push_back(std::move(a));
}
else if ( looking_at(*chunk, 0, "file") ) {
auto a = parseFileAnalyzer(*chunk);
SPICY_DEBUG(hilti::util::fmt(" Got file analyzer definition for %s", a.name));
_file_analyzers.push_back(a);
_file_analyzers.push_back(std::move(a));
}
else if ( looking_at(*chunk, 0, "packet") ) {
auto a = parsePacketAnalyzer(*chunk);
SPICY_DEBUG(hilti::util::fmt(" Got packet analyzer definition for %s", a.name));
_packet_analyzers.push_back(a);
_packet_analyzers.push_back(std::move(a));
}
else if ( looking_at(*chunk, 0, "on") ) {
@ -562,7 +562,7 @@ bool GlueCompiler::loadEvtFile(hilti::rt::filesystem::path& path) {
}
for ( auto&& ev : new_events )
_events.push_back(ev);
_events.push_back(std::move(ev));
return true;
}
@ -879,7 +879,7 @@ glue::Event GlueCompiler::parseEvent(const std::string& chunk) {
eat_token(chunk, &i, ",");
auto expr = extract_expr(chunk, &i);
ev.exprs.push_back(expr);
ev.exprs.push_back(std::move(expr));
first = false;
}
@ -945,7 +945,7 @@ glue::Export GlueCompiler::parseExport(const std::string& chunk) {
if ( looking_at(chunk, i, "&log") ) {
eat_token(chunk, &i, "&log");
export_.logs.insert(field);
export_.logs.insert(std::move(field));
}
if ( looking_at(chunk, i, "}") ) {
@ -1193,7 +1193,7 @@ bool GlueCompiler::PopulateEvents() {
acc.expression = e;
acc.location = ev.location;
// acc.dollar_id = util::startsWith(e, "$");
ev.expression_accessors.push_back(acc);
ev.expression_accessors.push_back(std::move(acc));
}
}