F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle zero-size attribute list.

Browse Source
This commit is contained in:
Mathieu Lacage
2009-03-03 16:07:16 +01:00
parent 9a8bbc1985
commit 27c630de9c
1 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/core/attribute-list.cc
View File

@@ -208,50 +208,51 @@ AttributeList::DeserializeFromString (std::string str)
std::string::size_type cur;
cur = 0;
do {
std::string::size_type equal = str.find ("=", cur);
if (equal == std::string::npos)
{
NS_FATAL_ERROR ("Error while parsing serialized attribute: \"" << str << "\"");
break;
}
else
{
std::string name = str.substr (cur, equal-cur);
struct TypeId::AttributeInfo info;
if (!TypeId::LookupAttributeByFullName (name, &info))
{
NS_FATAL_ERROR ("Error while parsing serialized attribute: name does not exist: \"" << name << "\"");
break;
}
else
{
std::string::size_type next = str.find ("|", cur);
std::string value;
if (next == std::string::npos)
{
value = str.substr (equal+1, str.size () - (equal+1));
cur = str.size ();
}
else
{
value = str.substr (equal+1, next - (equal+1));
cur++;
}
Ptr<AttributeValue> val = info.checker->Create ();
bool ok = val->DeserializeFromString (value, info.checker);
if (!ok)
{
NS_FATAL_ERROR ("Error while parsing serialized attribute: value invalid: \"" << value << "\"");
break;
}
else
{
DoSetOne (info.checker, *val);
}
}
}
} while (cur != str.size ());
while (cur != str.size ())
{
std::string::size_type equal = str.find ("=", cur);
if (equal == std::string::npos)
{
NS_FATAL_ERROR ("Error while parsing serialized attribute: \"" << str << "\"");
break;
}
else
{
std::string name = str.substr (cur, equal-cur);
struct TypeId::AttributeInfo info;
if (!TypeId::LookupAttributeByFullName (name, &info))
{
NS_FATAL_ERROR ("Error while parsing serialized attribute: name does not exist: \"" << name << "\"");
break;
}
else
{
std::string::size_type next = str.find ("|", cur);
std::string value;
if (next == std::string::npos)
{
value = str.substr (equal+1, str.size () - (equal+1));
cur = str.size ();
}
else
{
value = str.substr (equal+1, next - (equal+1));
cur++;
}
Ptr<AttributeValue> val = info.checker->Create ();
bool ok = val->DeserializeFromString (value, info.checker);
if (!ok)
{
NS_FATAL_ERROR ("Error while parsing serialized attribute: value invalid: \"" << value << "\"");
break;
}
else
{
DoSetOne (info.checker, *val);
}
}
}
}
return true;
}