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

Fix segfault when an existing enum identifier is added again with a

Browse source 
different value.

Addresses BIT-931.

Also switching the internal enum ID map to storing std::string for
easier memory management.
This commit is contained in:
Robin Sommer 2016-07-05 16:35:53 -07:00
parent 721693425f
commit ca3f7eadbe
5 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Type.cc
View file

@ -1437,13 +1437,11 @@ EnumType::EnumType(EnumType* e)
SetName(e->GetName());
for ( NameMap::iterator it = e->names.begin(); it != e->names.end(); ++it )
names[copy_string(it->first)] = it->second;
names[it->first] = it->second;
}
EnumType::~EnumType()
{
for ( NameMap::iterator iter = names.begin(); iter != names.end(); ++iter )
delete [] iter->first;
}
// Note, we use reporter->Error() here (not Error()) to include the current script
@ -1503,8 +1501,10 @@ void EnumType::CheckAndAddName(const string& module_name, const char* name,
// We allow double-definitions if matching exactly. This is so that
// we can define an enum both in a *.bif and *.bro for avoiding
// cyclic dependencies.
if ( id->Name() != make_full_var_name(module_name.c_str(), name)
|| (id->HasVal() && val != id->ID_Val()->AsEnum()) )
string fullname = make_full_var_name(module_name.c_str(), name);
if ( id->Name() != fullname
|| (id->HasVal() && val != id->ID_Val()->AsEnum())
|| (names.find(fullname) != names.end() && names[fullname] != val) )
{
Unref(id);
reporter->Error("identifier or enumerator value in enumerated type definition already exists");
@ -1530,7 +1530,7 @@ void EnumType::AddNameInternal(const string& module_name, const char* name,
bro_int_t val, bool is_export)
{
string fullname = make_full_var_name(module_name.c_str(), name);
names[copy_string(fullname.c_str())] = val;
names[fullname] = val;
}
bro_int_t EnumType::Lookup(const string& module_name, const char* name) const
@ -1549,7 +1549,7 @@ const char* EnumType::Lookup(bro_int_t value) const
for ( NameMap::const_iterator iter = names.begin();
iter != names.end(); ++iter )
if ( iter->second == value )
return iter->first;
return iter->first.c_str();
return 0;
}
@ -1570,7 +1570,7 @@ void EnumType::DescribeReST(ODesc* d, bool roles_only) const
// Create temporary, reverse name map so that enums can be documented
// in ascending order of their actual integral value instead of by name.
typedef map< bro_int_t, const char* > RevNameMap;
typedef map<bro_int_t, std::string> RevNameMap;
RevNameMap rev;
@ -1583,9 +1583,9 @@ void EnumType::DescribeReST(ODesc* d, bool roles_only) const
d->PushIndent();
if ( roles_only )
d->Add(fmt(":bro:enum:`%s`", it->second));
d->Add(fmt(":bro:enum:`%s`", it->second.c_str()));
else
d->Add(fmt(".. bro:enum:: %s %s", it->second, GetName().c_str()));
d->Add(fmt(".. bro:enum:: %s %s", it->second.c_str(), GetName().c_str()));
using broxygen::IdentifierInfo;
IdentifierInfo* doc = broxygen_mgr->GetIdentifierInfo(it->second);
@ -1593,7 +1593,7 @@ void EnumType::DescribeReST(ODesc* d, bool roles_only) const
if ( ! doc )
{
reporter->InternalWarning("Enum %s documentation lookup failure",
it->second);
it->second.c_str());
continue;
}