mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
A bunch of other minor issues reported by PVS-Studio
This commit is contained in:
parent
53f2364a86
commit
35ee96c4cb
7 changed files with 15 additions and 11 deletions
|
@ -645,7 +645,7 @@ public:
|
||||||
auto loc = detail::GetCurrentLocation();
|
auto loc = detail::GetCurrentLocation();
|
||||||
reporter->RuntimeError(&loc,
|
reporter->RuntimeError(&loc,
|
||||||
"Attempted to create DictEntry with excessively large key, "
|
"Attempted to create DictEntry with excessively large key, "
|
||||||
"truncating key (%" PRIu64 " > %d)",
|
"truncating key (%" PRIu64 " > %u)",
|
||||||
key_size, detail::DictEntry<T>::MAX_KEY_SIZE);
|
key_size, detail::DictEntry<T>::MAX_KEY_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,6 @@ void RandTest::add(const void* buf, int bufl)
|
||||||
if ( sccfirst )
|
if ( sccfirst )
|
||||||
{
|
{
|
||||||
sccfirst = 0;
|
sccfirst = 0;
|
||||||
scclast = 0;
|
|
||||||
sccu0 = oc;
|
sccu0 = oc;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -98,17 +97,15 @@ void RandTest::end(double* r_ent, double* r_chisq, double* r_mean, double* r_mon
|
||||||
double* r_scc)
|
double* r_scc)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
double ent, chisq, scc, datasum;
|
double ent = 0.0;
|
||||||
ent = 0.0;
|
double chisq = 0.0;
|
||||||
chisq = 0.0;
|
double datasum = 0.0;
|
||||||
scc = 0.0;
|
|
||||||
datasum = 0.0;
|
|
||||||
double prob[256]; /* Probabilities per bin for entropy */
|
double prob[256]; /* Probabilities per bin for entropy */
|
||||||
|
|
||||||
/* Complete calculation of serial correlation coefficient */
|
/* Complete calculation of serial correlation coefficient */
|
||||||
scct1 = scct1 + scclast * sccu0;
|
scct1 = scct1 + scclast * sccu0;
|
||||||
scct2 = scct2 * scct2;
|
scct2 = scct2 * scct2;
|
||||||
scc = totalc * scct3 - scct2;
|
double scc = totalc * scct3 - scct2;
|
||||||
if ( scc == 0.0 )
|
if ( scc == 0.0 )
|
||||||
scc = -100000;
|
scc = -100000;
|
||||||
else
|
else
|
||||||
|
|
|
@ -77,6 +77,9 @@ void String::Reset()
|
||||||
|
|
||||||
const String& String::operator=(const String& bs)
|
const String& String::operator=(const String& bs)
|
||||||
{
|
{
|
||||||
|
if ( this == &bs )
|
||||||
|
return *this;
|
||||||
|
|
||||||
Reset();
|
Reset();
|
||||||
n = bs.n;
|
n = bs.n;
|
||||||
b = new u_char[n + 1];
|
b = new u_char[n + 1];
|
||||||
|
|
|
@ -630,7 +630,7 @@ Plugin* Manager::LookupPluginByPath(std::string_view _path)
|
||||||
static bool hook_cmp(std::pair<int, Plugin*> a, std::pair<int, Plugin*> b)
|
static bool hook_cmp(std::pair<int, Plugin*> a, std::pair<int, Plugin*> b)
|
||||||
{
|
{
|
||||||
if ( a.first == b.first )
|
if ( a.first == b.first )
|
||||||
return util::strtolower(a.second->Name()) < util::strtolower(a.second->Name());
|
return util::strtolower(a.second->Name()) < util::strtolower(b.second->Name());
|
||||||
|
|
||||||
// Reverse sort.
|
// Reverse sort.
|
||||||
return a.first > b.first;
|
return a.first > b.first;
|
||||||
|
|
|
@ -70,6 +70,10 @@ std::unique_ptr<BloomFilter> BloomFilter::Unserialize(const broker::data& data)
|
||||||
case Counting:
|
case Counting:
|
||||||
bf = std::unique_ptr<BloomFilter>(new CountingBloomFilter());
|
bf = std::unique_ptr<BloomFilter>(new CountingBloomFilter());
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
reporter->Error("found invalid bloom filter type");
|
||||||
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! bf->DoUnserialize((*v)[2]) )
|
if ( ! bf->DoUnserialize((*v)[2]) )
|
||||||
|
|
|
@ -158,7 +158,7 @@ double CardinalityCounter::Size() const
|
||||||
answer = 1 / answer;
|
answer = 1 / answer;
|
||||||
answer = (alpha_m * m * m * answer);
|
answer = (alpha_m * m * m * answer);
|
||||||
|
|
||||||
if ( answer <= 5.0 * (m / 2) )
|
if ( answer <= 5.0 * (((double)m) / 2) )
|
||||||
return m * log(((double)m) / V);
|
return m * log(((double)m) / V);
|
||||||
|
|
||||||
else if ( answer <= (pow(2, 64) / 30) )
|
else if ( answer <= (pow(2, 64) / 30) )
|
||||||
|
|
|
@ -349,7 +349,7 @@ static bool read_random_seeds(const char* read_file, uint32_t* seed,
|
||||||
// Read seeds for hmac-md5/siphash/highwayhash.
|
// Read seeds for hmac-md5/siphash/highwayhash.
|
||||||
for ( auto& v : buf )
|
for ( auto& v : buf )
|
||||||
{
|
{
|
||||||
int tmp;
|
uint32_t tmp;
|
||||||
if ( fscanf(f, "%u", &tmp) != 1 )
|
if ( fscanf(f, "%u", &tmp) != 1 )
|
||||||
{
|
{
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue