games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Code Issues Releases Activity

Avoid crash on invalid artifact in bank config

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-20 18:17:23 +02:00
parent 06517acd67
commit 912262e826
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/JsonRandom.cpp
View File

@ -82,7 +82,7 @@ namespace JsonRandom
IdentifierType decodeKey(const std::string & modScope, const std::string & value, const Variables & variables) IdentifierType decodeKey(const std::string & modScope, const std::string & value, const Variables & variables)
{ {
if (value.empty() || value[0] != '@') if (value.empty() || value[0] != '@')
return IdentifierType(*VLC->identifiers()->getIdentifier(modScope, IdentifierType::entityType(), value)); return IdentifierType(VLC->identifiers()->getIdentifier(modScope, IdentifierType::entityType(), value).value_or(-1));
else else
return loadVariable(IdentifierType::entityType(), value, variables, IdentifierType::NONE); return loadVariable(IdentifierType::entityType(), value, variables, IdentifierType::NONE);
} }
@ -91,7 +91,7 @@ namespace JsonRandom
IdentifierType decodeKey(const JsonNode & value, const Variables & variables) IdentifierType decodeKey(const JsonNode & value, const Variables & variables)
{ {
if (value.String().empty() || value.String()[0] != '@') if (value.String().empty() || value.String()[0] != '@')
return IdentifierType(*VLC->identifiers()->getIdentifier(IdentifierType::entityType(), value)); return IdentifierType(VLC->identifiers()->getIdentifier(IdentifierType::entityType(), value).value_or(-1));
else else
return loadVariable(IdentifierType::entityType(), value.String(), variables, IdentifierType::NONE); return loadVariable(IdentifierType::entityType(), value.String(), variables, IdentifierType::NONE);
} }