luo980/json-schema-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

validator: both, properties and patterProperties needs validation

Browse Source
This commit is contained in:
Patrick Boettcher 2016-12-27 13:20:50 +01:00
parent 998f97ba4e
commit 8939ba9b05
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/json-validator.cpp
View File

@ -605,25 +605,25 @@ void json_validator::validate_object(json &instance, const json &schema, const s
for (auto child = instance.begin(); child != instance.end(); ++child) { for (auto child = instance.begin(); child != instance.end(); ++child) {
std::string child_name = name + "." + child.key(); std::string child_name = name + "." + child.key();
bool property_or_patternProperties_has_validated = false;
// is this a property which is described in the schema // is this a property which is described in the schema
const auto &object_prop = properties.find(child.key()); const auto &object_prop = properties.find(child.key());
if (object_prop != properties.end()) { if (object_prop != properties.end()) {
// validate the element with its schema // validate the element with its schema
validate(child.value(), object_prop.value(), child_name); validate(child.value(), object_prop.value(), child_name);
continue; property_or_patternProperties_has_validated = true;
} }
bool patternProperties_has_matched = false;
for (auto pp = patternProperties.begin(); for (auto pp = patternProperties.begin();
pp != patternProperties.end(); ++pp) { pp != patternProperties.end(); ++pp) {
std::regex re(pp.key(), std::regex::ECMAScript); std::regex re(pp.key(), std::regex::ECMAScript);
if (std::regex_search(child.key(), re)) { if (std::regex_search(child.key(), re)) {
validate(child.value(), pp.value(), child_name); validate(child.value(), pp.value(), child_name);
patternProperties_has_matched = true; property_or_patternProperties_has_validated = true;
} }
} }
if (patternProperties_has_matched) if (property_or_patternProperties_has_validated)
continue; continue;
switch (additionalProperties) { switch (additionalProperties) {