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

Merge remote-tracking branch 'origin/topic/timw/coverity'

Browse source 
* origin/topic/timw/coverity:
  Add a few std::moves to fix Coverity warnings
  Fix possible memory leak in broker::Manager
  fixup! Use SCN* constants when reading into sized integer types
  from_json: Statically lookup err index in result type
  Use SCN* constants when reading into sized integer types
  Remove setting unused variable value in FTP::parse_eftp
This commit is contained in:
Tim Wojtulewicz 2025-05-27 12:49:05 -07:00
commit 88ae3ba412
10 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGES
View file

@ -1,3 +1,17 @@
8.0.0-dev.259 | 2025-05-27 12:49:05 -0700
* Add a few std::moves to fix Coverity warnings (Tim Wojtulewicz, Corelight)
* Fix possible memory leak in broker::Manager (Tim Wojtulewicz, Corelight)
* fixup! Use SCN* constants when reading into sized integer types (Tim Wojtulewicz, Corelight)
* from_json: Statically lookup err index in result type (Tim Wojtulewicz, Corelight)
* Use SCN* constants when reading into sized integer types (Tim Wojtulewicz, Corelight)
* Remove setting unused variable value in FTP::parse_eftp (Tim Wojtulewicz, Corelight)
8.0.0-dev.252 | 2025-05-27 11:59:00 -0700 8.0.0-dev.252 | 2025-05-27 11:59:00 -0700
* Update .clang-tidy to have bugprone-* enabled with some exclusions (Tim Wojtulewicz, Corelight) * Update .clang-tidy to have bugprone-* enabled with some exclusions (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.252 8.0.0-dev.259

2
src/DNS_Mapping.cc
View file

@ -48,7 +48,7 @@ DNS_Mapping::DNS_Mapping(FILE* f) {
int failed_local; int failed_local;
int num_addrs; int num_addrs;
if ( sscanf(buf, "%lf %d %512s %d %512s %d %d %" PRIu32, &creation_time, &is_req_host, req_buf, &failed_local, if ( sscanf(buf, "%lf %d %512s %d %512s %d %d %" SCNu32, &creation_time, &is_req_host, req_buf, &failed_local,
name_buf, &req_type, &num_addrs, &req_ttl) != 8 ) { name_buf, &req_type, &num_addrs, &req_ttl) != 8 ) {
no_mapping = true; no_mapping = true;
return; return;

2
src/DebugLogger.cc
View file

@ -113,7 +113,7 @@ void DebugLogger::EnableStreams(const char* s) {
if ( util::starts_with(ltok, "plugin-") ) { if ( util::starts_with(ltok, "plugin-") ) {
// Cannot verify this at this time, plugins may not // Cannot verify this at this time, plugins may not
// have been loaded. // have been loaded.
enabled_streams.insert(ltok); enabled_streams.insert(std::move(ltok));
goto next; goto next;
} }

2
src/Func.cc
View file

@ -866,7 +866,7 @@ static std::set<EventGroupPtr> get_func_groups(const std::vector<AttrPtr>& attrs
} }
auto group = event_registry->RegisterGroup(EventGroupKind::Attribute, v->AsStringVal()->ToStdStringView()); auto group = event_registry->RegisterGroup(EventGroupKind::Attribute, v->AsStringVal()->ToStdStringView());
groups.insert(group); groups.insert(std::move(group));
} }
return groups; return groups;

4
src/analyzer/protocol/bittorrent/BitTorrentTracker.cc
View file

@ -11,8 +11,8 @@
#include "zeek/analyzer/protocol/bittorrent/events.bif.h" #include "zeek/analyzer/protocol/bittorrent/events.bif.h"
#include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h"
#define FMT_INT "%" PRId64 #define FMT_INT "%" SCNd64
#define FMT_UINT "%" PRIu64 #define FMT_UINT "%" SCNu64
namespace zeek::analyzer::bittorrent { namespace zeek::analyzer::bittorrent {

3
src/analyzer/protocol/ftp/functions.bif
View file

@ -76,10 +76,7 @@ static zeek::RecordValPtr parse_eftp(const char* line)
{ {
const char* nptr = strchr(line, delimiter); const char* nptr = strchr(line, delimiter);
if ( nptr == NULL ) if ( nptr == NULL )
{
nptr = line + strlen(line); nptr = line + strlen(line);
good = false;
}
std::string s(line, nptr-line); // extract IP address std::string s(line, nptr-line); // extract IP address
struct in6_addr result; struct in6_addr result;

4
src/broker/Manager.cc
View file

@ -2094,13 +2094,15 @@ detail::StoreHandleVal* Manager::MakeClone(const string& name, double resync_int
} }
auto handle = new detail::StoreHandleVal{*result}; auto handle = new detail::StoreHandleVal{*result};
Ref(handle);
if ( ! handle->proxy.valid() ) { if ( ! handle->proxy.valid() ) {
reporter->Error("Failed to create clone for data store %s", name.c_str()); reporter->Error("Failed to create clone for data store %s", name.c_str());
delete handle;
return nullptr; return nullptr;
} }
Ref(handle);
data_stores.emplace(name, handle); data_stores.emplace(name, handle);
if ( ! iosource_mgr->RegisterFd(handle->proxy.mailbox().descriptor(), this) ) if ( ! iosource_mgr->RegisterFd(handle->proxy.mailbox().descriptor(), this) )
reporter->FatalError("Failed to register broker clone mailbox descriptor with iosource_mgr"); reporter->FatalError("Failed to register broker clone mailbox descriptor with iosource_mgr");

2
src/logging/Manager.cc
View file

@ -811,7 +811,7 @@ bool Manager::TraverseRecord(Stream* stream, Filter* filter, RecordType* rt, Tab
} }
// Alright, we want this field. // Alright, we want this field.
filter->indices.push_back(new_indices); filter->indices.push_back(std::move(new_indices));
// Static cast this to void* to avoid a clang-tidy warning about converting from the // Static cast this to void* to avoid a clang-tidy warning about converting from the
// double-pointer to void* // double-pointer to void*

14
src/zeek.bif
View file

@ -11,7 +11,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <algorithm> #include <algorithm>
#include <cmath> #include <cinttypes>
#include <cmath> #include <cmath>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
@ -3299,10 +3299,11 @@ function ptr_name_to_addr%(s: string%): addr
uint32_t b[32]; uint32_t b[32];
char ss[9]; // this will contain "ip6.arpa" char ss[9]; // this will contain "ip6.arpa"
if ( sscanf(s->CheckString(), if ( sscanf(s->CheckString(),
"%1x.%1x.%1x.%1x.%1x.%1x.%1x.%1x." "%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32
"%1x.%1x.%1x.%1x.%1x.%1x.%1x.%1x." ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32
"%1x.%1x.%1x.%1x.%1x.%1x.%1x.%1x." ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32
"%1x.%1x.%1x.%1x.%1x.%1x.%1x.%1x.%8s", ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32 ".%1" SCNx32
".%8s",
b+31, b+30, b+29, b+28, b+27, b+26, b+25, b+24, b+31, b+30, b+29, b+28, b+27, b+26, b+25, b+24,
b+23, b+22, b+21, b+20, b+19, b+18, b+17, b+16, b+23, b+22, b+21, b+20, b+19, b+18, b+17, b+16,
b+15, b+14, b+13, b+12, b+11, b+10, b+9, b+8, b+15, b+14, b+13, b+12, b+11, b+10, b+9, b+8,
@ -5319,6 +5320,7 @@ function from_json%(s: string, t: any, key_func: string_mapper &default=from_jso
static auto result_type = zeek::id::find_type<RecordType>("from_json_result"); static auto result_type = zeek::id::find_type<RecordType>("from_json_result");
static auto v_idx = result_type->FieldOffset("v"); static auto v_idx = result_type->FieldOffset("v");
static auto valid_idx = result_type->FieldOffset("valid"); static auto valid_idx = result_type->FieldOffset("valid");
static auto err_idx = result_type->FieldOffset("err");
static auto default_key_func_ptr = zeek::id::find_func("from_json_default_key_mapper"); static auto default_key_func_ptr = zeek::id::find_func("from_json_default_key_mapper");
auto rval = zeek::make_intrusive<RecordVal>(result_type); auto rval = zeek::make_intrusive<RecordVal>(result_type);
@ -5347,7 +5349,7 @@ function from_json%(s: string, t: any, key_func: string_mapper &default=from_jso
else else
{ {
rval->Assign(valid_idx, false); rval->Assign(valid_idx, false);
rval->Assign(result_type->FieldOffset("err"), res.error().c_str()); rval->Assign(err_idx, res.error().c_str());
} }
return std::move(rval); return std::move(rval);