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

Fixes Coverity issues reported from DNS_Mgr merge

Browse source 
Reports fixed: 1488295, 1488292, 1488281, 1488279
This commit is contained in:
Tim Wojtulewicz 2022-05-03 09:49:47 -07:00
parent aa5a5b2136
commit e28d561f79
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/DNS_Mapping.cc
View file

@ -314,7 +314,8 @@ TEST_CASE("dns_mapping save reload")
char buffer[4096]; char buffer[4096];
memset(buffer, 0, 4096); memset(buffer, 0, 4096);
FILE* tmpfile = fmemopen(buffer, 4096, "r+"); FILE* tmpfile = fmemopen(buffer, 4096, "r+");
fseek(tmpfile, 0, SEEK_END); if ( fseek(tmpfile, 0, SEEK_END) < 0 )
reporter->Error("DNS_Mapping: seek failed");
// Try loading from the file at EOF. This should cause a mapping failure. // Try loading from the file at EOF. This should cause a mapping failure.
DNS_Mapping mapping(tmpfile); DNS_Mapping mapping(tmpfile);

18
src/DNS_Mgr.cc
View file

@ -246,7 +246,9 @@ DNS_Request::~DNS_Request() { }
void DNS_Request::MakeRequest(ares_channel channel, DNS_Mgr* mgr) void DNS_Request::MakeRequest(ares_channel channel, DNS_Mgr* mgr)
{ {
// This needs to get deleted at the end of the callback method. // This needs to get deleted at the end of the callback method.
auto req_data = new CallbackArgs{this, mgr}; auto req_data = std::make_unique<CallbackArgs>();
req_data->req = this;
req_data->mgr = mgr;
// It's completely fine if this rolls over. It's just to keep the query ID different // It's completely fine if this rolls over. It's just to keep the query ID different
// from one query to the next, and it's unlikely we'd do 2^16 queries so fast that // from one query to the next, and it's unlikely we'd do 2^16 queries so fast that
@ -260,7 +262,7 @@ void DNS_Request::MakeRequest(ares_channel channel, DNS_Mgr* mgr)
// back in the same request if use ares_getaddrinfo() so we can store them both // back in the same request if use ares_getaddrinfo() so we can store them both
// in the same mapping. // in the same mapping.
ares_addrinfo_hints hints = {ARES_AI_CANONNAME, AF_UNSPEC, 0, 0}; ares_addrinfo_hints hints = {ARES_AI_CANONNAME, AF_UNSPEC, 0, 0};
ares_getaddrinfo(channel, host.c_str(), NULL, &hints, addrinfo_cb, req_data); ares_getaddrinfo(channel, host.c_str(), NULL, &hints, addrinfo_cb, req_data.release());
} }
else else
{ {
@ -276,12 +278,12 @@ void DNS_Request::MakeRequest(ares_channel channel, DNS_Mgr* mgr)
query_host.c_str(), C_IN, request_type, DNS_Request::request_id, 1, query_host.c_str(), C_IN, request_type, DNS_Request::request_id, 1,
out_ptr<unsigned char*>(query_str), &len, MAX_UDP_BUFFER_SIZE); out_ptr<unsigned char*>(query_str), &len, MAX_UDP_BUFFER_SIZE);
if ( status != ARES_SUCCESS ) if ( status != ARES_SUCCESS || query_str == nullptr )
return; return;
// Store this so it can be destroyed when the request is destroyed. // Store this so it can be destroyed when the request is destroyed.
this->query = std::move(query_str); this->query = std::move(query_str);
ares_send(channel, this->query.get(), len, query_cb, req_data); ares_send(channel, this->query.get(), len, query_cb, req_data.release());
} }
} }
@ -983,8 +985,9 @@ void DNS_Mgr::Resolve()
break; break;
tvp = ares_timeout(channel, &tv, &tv); tvp = ares_timeout(channel, &tv, &tv);
select(nfds, &read_fds, &write_fds, NULL, tvp); int res = select(nfds, &read_fds, &write_fds, NULL, tvp);
ares_process(channel, &read_fds, &write_fds); if ( res >= 0 )
ares_process(channel, &read_fds, &write_fds);
} }
} }
@ -1166,7 +1169,10 @@ void DNS_Mgr::LoadCache(const std::string& path)
return; return;
if ( ! DNS_Mapping::ValidateCacheVersion(f) ) if ( ! DNS_Mapping::ValidateCacheVersion(f) )
{
fclose(f);
return; return;
}
// Loop until we find a mapping that doesn't initialize correctly. // Loop until we find a mapping that doesn't initialize correctly.
auto m = std::make_shared<DNS_Mapping>(f); auto m = std::make_shared<DNS_Mapping>(f);