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

Fix crashes during deserialization of invalid data

Browse Source 
#514
This commit is contained in:
Wojtek Figat
2021-05-12 13:42:07 +02:00
parent f71d58a081
commit 0509f9710f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Engine/Serialization/Serialization.cpp
View File

@@ -73,7 +73,7 @@ void Serialization::Deserialize(ISerializable::DeserializeStream& stream, Varian
else
v.Type = VariantType::Null;
const auto mTypeName = SERIALIZE_FIND_MEMBER(stream, "TypeName");
if (mTypeName != stream.MemberEnd())
if (mTypeName != stream.MemberEnd() && mTypeName->value.IsString())
v.SetTypeName(StringAnsiView(mTypeName->value.GetString(), mTypeName->value.GetStringLength()));
}
else
@@ -256,6 +256,7 @@ void Serialization::Deserialize(ISerializable::DeserializeStream& stream, Varian
v.AsPointer = (void*)(uintptr)value.GetUint64();
break;
case VariantType::String:
CHECK(value.IsString());
v.SetString(StringAnsiView(value.GetString(), value.GetStringLength()));
break;
case VariantType::Object:
@@ -269,6 +270,7 @@ void Serialization::Deserialize(ISerializable::DeserializeStream& stream, Varian
break;
case VariantType::Structure:
case VariantType::Blob:
CHECK(value.IsString());
id.A = value.GetStringLength();
v.SetBlob(id.A);
Encryption::Base64Decode(value.GetString(), id.A, (byte*)v.AsBlob.Data);
@@ -325,6 +327,7 @@ void Serialization::Deserialize(ISerializable::DeserializeStream& stream, Varian
Deserialize(value, *v.AsDictionary, modifier);
break;
case VariantType::Typename:
CHECK(value.IsString());
v.SetTypename(StringAnsiView(value.GetString(), value.GetStringLength()));
break;
default:
@@ -344,7 +347,7 @@ void Serialization::Serialize(ISerializable::SerializeStream& stream, const Guid
void Serialization::Deserialize(ISerializable::DeserializeStream& stream, Guid& v, ISerializeModifier* modifier)
{
if (stream.GetStringLength() != 32)
if (!stream.IsString() || stream.GetStringLength() != 32)
{
v = Guid::Empty;
return;