From 22551e941069a5bdf715282f3a110b102aa90baa Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 30 Jul 2021 10:58:06 +0200 Subject: [PATCH] Fix crash when loading empty managed object data --- Source/Engine/Scripting/ManagedSerialization.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Engine/Scripting/ManagedSerialization.cpp b/Source/Engine/Scripting/ManagedSerialization.cpp index 70658222b..cd2f9fff4 100644 --- a/Source/Engine/Scripting/ManagedSerialization.cpp +++ b/Source/Engine/Scripting/ManagedSerialization.cpp @@ -88,7 +88,6 @@ void ManagedSerialization::Deserialize(ISerializable::DeserializeStream& stream, { if (!object) return; - ASSERT(stream.IsObject()); // Get serialized data rapidjson_flax::StringBuffer buffer; @@ -100,10 +99,10 @@ void ManagedSerialization::Deserialize(ISerializable::DeserializeStream& stream, void ManagedSerialization::Deserialize(const StringAnsiView& data, MonoObject* object) { - if (!object) - return; const char* str = data.Get(); const int32 len = data.Length(); + if (!object || len == 0) + return; // Skip case {} to improve performance if (StringUtils::Compare(str, "{}") == 0)