GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix loading null as Guid for object refs in C++ Json parser

Browse Source
This commit is contained in:
Wojtek Figat
2021-08-27 16:06:23 +02:00
parent 7f00fa4fd9
commit e4cb87ea9e
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Core/Config/GameSettings.cpp
View File

@@ -188,7 +188,7 @@ void GameSettings::Deserialize(DeserializeStream& stream, ISerializeModifier* mo
SplashScreen = JsonTools::GetGuid(stream, "SplashScreen");
CustomSettings.Clear();
const auto customSettings = stream.FindMember("CustomSettings");
if (customSettings != stream.MemberEnd())
if (customSettings != stream.MemberEnd() && customSettings->value.IsArray())
{
auto& items = customSettings->value;
for (auto it = items.MemberBegin(); it != items.MemberEnd(); ++it)

22
Source/Engine/Serialization/JsonTools.cpp
View File

@@ -103,6 +103,28 @@ Matrix JsonTools::GetMatrix(const Value& value)
return result;
}
Guid JsonTools::GetGuid(const Value& value)
{
if (value.IsNull())
return Guid::Empty;
CHECK_RETURN(value.GetStringLength() == 32, Guid::Empty);
// Split
const char* a = value.GetString();
const char* b = a + 8;
const char* c = b + 8;
const char* d = c + 8;
// Parse
Guid result;
StringUtils::ParseHex(a, 8, &result.A);
StringUtils::ParseHex(b, 8, &result.B);
StringUtils::ParseHex(c, 8, &result.C);
StringUtils::ParseHex(d, 8, &result.D);
return result;
}
DateTime JsonTools::GetDate(const Value& value)
{
return DateTime(value.GetInt64());

19
Source/Engine/Serialization/JsonTools.h
View File

@@ -174,24 +174,7 @@ public:
);
}
static Guid GetGuid(const Value& value)
{
CHECK_RETURN(value.GetStringLength() == 32, Guid::Empty);
// Split
const char* a = value.GetString();
const char* b = a + 8;
const char* c = b + 8;
const char* d = c + 8;
// Parse
Guid result;
StringUtils::ParseHex(a, 8, &result.A);
StringUtils::ParseHex(b, 8, &result.B);
StringUtils::ParseHex(c, 8, &result.C);
StringUtils::ParseHex(d, 8, &result.D);
return result;
}
static Guid GetGuid(const Value& value);
static DateTime GetDate(const Value& value);