tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix invalid field IDs in Type::GetField 

refs #10387
This commit is contained in:
Gunnar Beutner 2015-11-05 10:58:09 +01:00
parent 783b58536f
commit 645f054980
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/base/type.cpp
View File

@ -114,14 +114,18 @@ void Type::SetField(int id, const Value& value, bool suppress_events, const Valu
Value Type::GetField(int id) const Value Type::GetField(int id) const
{ {
if (id == 0) int real_id = id - Object::TypeInstance->GetFieldCount();
if (real_id < 0)
return Object::GetField(id);
if (real_id == 0)
return GetName(); return GetName();
else if (id == 1) else if (real_id == 1)
return GetPrototype(); return GetPrototype();
else if (id == 2) else if (real_id == 2)
return GetBaseType(); return GetBaseType();
return Object::GetField(id - 3); BOOST_THROW_EXCEPTION(std::runtime_error("Invalid field ID."));
} }
std::vector<String> Type::GetLoadDependencies(void) const std::vector<String> Type::GetLoadDependencies(void) const