games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Fix possible crashes on attempt to parse bonus

Browse Source
This commit is contained in:
Ivan Savenko
2025-06-15 23:54:43 +03:00
parent f9b4a36a5f
commit 464865f20d
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/CCreatureHandler.cpp
View File

@@ -903,19 +903,15 @@ void CCreatureHandler::loadCreatureJson(CCreature * creature, const JsonNode & c
{ {
creature->animDefName = AnimationPath::fromJson(config["graphics"]["animation"]); creature->animDefName = AnimationPath::fromJson(config["graphics"]["animation"]);
//FIXME: MOD COMPATIBILITY for(const auto & ability : config["abilities"].Struct())
if (config["abilities"].getType() == JsonNode::JsonType::DATA_STRUCT)
{ {
for(const auto & ability : config["abilities"].Struct()) if (!ability.second.isNull())
{ {
if (!ability.second.isNull()) auto b = JsonUtils::parseBonus(ability.second, creature->getBonusTextID(ability.first));
{ b->source = BonusSource::CREATURE_ABILITY;
auto b = JsonUtils::parseBonus(ability.second, creature->getBonusTextID(ability.first)); b->sid = BonusSourceID(creature->getId());
b->source = BonusSource::CREATURE_ABILITY; b->duration = BonusDuration::PERMANENT;
b->sid = BonusSourceID(creature->getId()); creature->addNewBonus(b);
b->duration = BonusDuration::PERMANENT;
creature->addNewBonus(b);
}
} }
} }

8
lib/json/JsonBonus.cpp
View File

@@ -404,7 +404,7 @@ static TUpdaterPtr parseUpdater(const JsonNode & updaterJson)
if(updaterJson["type"].String() == "GROWS_WITH_LEVEL") if(updaterJson["type"].String() == "GROWS_WITH_LEVEL")
{ {
// MOD COMPATIBILITY - parameters is deprecated in 1.7 // MOD COMPATIBILITY - parameters is deprecated in 1.7
const JsonVector param = updaterJson["parameters"].Vector(); const JsonNode & param = updaterJson["parameters"];
int valPer20 = updaterJson["valPer20"].isNull() ? param[0].Integer() : updaterJson["valPer20"].Integer(); int valPer20 = updaterJson["valPer20"].isNull() ? param[0].Integer() : updaterJson["valPer20"].Integer();
int stepSize = updaterJson["stepSize"].isNull() ? param[1].Integer() : updaterJson["stepSize"].Integer(); int stepSize = updaterJson["stepSize"].isNull() ? param[1].Integer() : updaterJson["stepSize"].Integer();
@@ -648,6 +648,12 @@ bool JsonUtils::parseBonus(const JsonNode &ability, Bonus *b, const TextIdentifi
const JsonNode & subtypeNode = ability["subtype"]; const JsonNode & subtypeNode = ability["subtype"];
const JsonNode & addinfoNode = ability["addInfo"]; const JsonNode & addinfoNode = ability["addInfo"];
if (ability["type"].isNull())
{
logMod->error("Failed to parse bonus. Description: '%s'. Config: '%s'", descriptionID.get(), ability.toCompactString());
return false;
}
LIBRARY->identifiers()->requestIdentifier("bonus", ability["type"], [b, subtypeNode, addinfoNode](si32 bonusID) LIBRARY->identifiers()->requestIdentifier("bonus", ability["type"], [b, subtypeNode, addinfoNode](si32 bonusID)
{ {
b->type = static_cast<BonusType>(bonusID); b->type = static_cast<BonusType>(bonusID);