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

Fixed a few CWE-457

Browse Source
This commit is contained in:
AlexVinS
2016-11-27 22:07:01 +03:00
parent abe4beebc6
commit 3216422307
23 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CModHandler.cpp
View File

@ -486,12 +486,22 @@ JsonNode addMeta(JsonNode config, std::string meta)
return config;
}
CModInfo::CModInfo():
checksum(0),
enabled(false),
validation(PENDING)
{
}
CModInfo::CModInfo(std::string identifier,const JsonNode & local, const JsonNode & config):
identifier(identifier),
name(config["name"].String()),
description(config["description"].String()),
dependencies(config["depends"].convertTo<std::set<std::string> >()),
conflicts(config["conflicts"].convertTo<std::set<std::string> >()),
checksum(0),
enabled(false),
validation(PENDING),
config(addMeta(config, identifier))
{
@ -554,6 +564,10 @@ void CModInfo::loadLocalData(const JsonNode & data)
CModHandler::CModHandler()
{
modules.COMMANDERS = false;
modules.STACK_ARTIFACT = false;
modules.STACK_EXP = false;
modules.MITHRIL = false;
for (int i = 0; i < GameConstants::RESOURCE_QUANTITY; ++i)
{
identifiers.registerObject("core", "resource", GameConstants::RESOURCE_NAMES[i], i);