zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-21 11:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

dictionary from empty string is not an error, but empty dictionary

Browse source
This commit is contained in:
Alexander Kromm 2019-12-31 22:37:34 +07:00 committed by Christoph Oelckers
parent 4bc923dddf
commit 2f9177127c
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/serializer.cpp
View file

@ -2185,19 +2185,24 @@ FString DictionaryToString(const Dictionary &dict)
Dictionary *DictionaryFromString(const FString &string)
{
if (string.IsEmpty())
if (string.Compare("null") == 0)
{
return nullptr;
}
Dictionary *const dict = new Dictionary;
if (string.IsEmpty())
{
return dict;
}
rapidjson::Document doc;
doc.Parse(string.GetChars(), string.Len());
if (doc.GetType() != rapidjson::Type::kObjectType)
{
I_Error("Dictionary is expected to be an object.");
I_Error("Dictionary is expected to be a JSON object.");
return dict;
}
@ -2205,7 +2210,7 @@ Dictionary *DictionaryFromString(const FString &string)
{
if (i->value.GetType() != rapidjson::Type::kStringType)
{
I_Error("Dictionary value is expected to be a string.");
I_Error("Dictionary value is expected to be a JSON string.");
return dict;
}
@ -2219,7 +2224,7 @@ template<> FSerializer &Serialize(FSerializer &arc, const char *key, Dictionary
{
if (arc.isWriting())
{
FString contents { dict ? DictionaryToString(*dict) : "" };
FString contents { dict ? DictionaryToString(*dict) : "null" };
return arc(key, contents);
}
else