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

Fix bug with List where replace() doesn't work with non-pointer types

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-04-30 13:04:38 -07:00
parent fda9498276
commit 615f8cd443
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/List.h
View file

@ -240,16 +240,16 @@ public:
T replace(int ent_index, const T& new_ent) // replace entry #i with a new value T replace(int ent_index, const T& new_ent) // replace entry #i with a new value
{ {
if ( ent_index < 0 ) if ( ent_index < 0 )
return 0; return get_default_value();
T old_ent = nullptr; T old_ent = get_default_value();
if ( ent_index > num_entries - 1 ) if ( ent_index > num_entries - 1 )
{ // replacement beyond the end of the list { // replacement beyond the end of the list
resize(ent_index + 1); resize(ent_index + 1);
for ( int i = num_entries; i < max_entries; ++i ) for ( int i = num_entries; i < max_entries; ++i )
entries[i] = nullptr; entries[i] = get_default_value();
num_entries = max_entries; num_entries = max_entries;
} }
else else
@ -287,6 +287,20 @@ public:
protected: protected:
T get_default_value()
{
if constexpr ( std::is_pointer_v<T> )
return nullptr;
else if constexpr ( std::is_integral_v<T> )
return 0;
else if constexpr ( std::is_floating_point_v<T> )
return 0.0;
else
// TODO: Should this return an error at compile time that we don't
// know what this type is?
return T();
}
// This could essentially be an std::vector if we wanted. Some // This could essentially be an std::vector if we wanted. Some
// reasons to maybe not refactor to use std::vector ? // reasons to maybe not refactor to use std::vector ?
// //