games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Fix crash on using JsonDeserializer on JsonNode without valid mod scope

Browse Source
This commit is contained in:
Ivan Savenko
2025-07-20 16:22:35 +03:00
parent 81d09aee14
commit aab628c5d4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/serializer/JsonSerializer.cpp
+4
View File
@@ -78,6 +78,7 @@ void JsonSerializer::serializeInternal(const std::string & fieldName, std::vecto
void JsonSerializer::serializeInternal(std::string & value) void JsonSerializer::serializeInternal(std::string & value)
{ {
currentObject->String() = value; currentObject->String() = value;
currentObject->setModScope(ModScope::scopeGame());
} }
void JsonSerializer::serializeInternal(int64_t & value) void JsonSerializer::serializeInternal(int64_t & value)
@@ -105,7 +106,10 @@ void JsonSerializer::serializeLIC(const std::string & fieldName, LICSet & value)
void JsonSerializer::serializeString(const std::string & fieldName, std::string & value) void JsonSerializer::serializeString(const std::string & fieldName, std::string & value)
{ {
if(!value.empty()) if(!value.empty())
{
currentObject->operator[](fieldName).String() = value; currentObject->operator[](fieldName).String() = value;
currentObject->operator[](fieldName).setModScope(ModScope::scopeGame());
}
} }
void JsonSerializer::serializeRaw(const std::string & fieldName, JsonNode & value, const std::optional<std::reference_wrapper<const JsonNode>> defaultValue) void JsonSerializer::serializeRaw(const std::string & fieldName, JsonNode & value, const std::optional<std::reference_wrapper<const JsonNode>> defaultValue)