games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

fix crash in jsonschema in case of invalid typename

Browse Source
This commit is contained in:
alexvins 2014-03-10 15:58:13 +00:00
parent 5ec750e0f5
commit 9f01a92f4c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/JsonDetail.cpp
View File

@ -594,8 +594,15 @@ namespace
} }
std::string typeCheck(Validation::ValidationData & validator, const JsonNode & baseSchema, const JsonNode & schema, const JsonNode & data) std::string typeCheck(Validation::ValidationData & validator, const JsonNode & baseSchema, const JsonNode & schema, const JsonNode & data)
{ {
JsonNode::JsonType type = stringToType.find(schema.String())->second; const auto typeName = schema.String();
auto it = stringToType.find(typeName);
if(it == stringToType.end())
{
return validator.makeErrorMessage("Unknown type in schema:" + typeName);
}
JsonNode::JsonType type = it->second;
if(type != data.getType() && data.getType() != JsonNode::DATA_NULL) if(type != data.getType() && data.getType() != JsonNode::DATA_NULL)
return validator.makeErrorMessage("Type mismatch! Expected " + schema.String()); return validator.makeErrorMessage("Type mismatch! Expected " + schema.String());
return ""; return "";