gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #977 from miloyip/issue825_patternProperties

Browse Source 
Fix patternProperties & additionalProperties lead to ASSERT
This commit is contained in:
Milo Yip 2017-06-09 15:06:11 +08:00 committed by GitHub
commit b596f4e990
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rapidjson/schema.h
View File

@ -783,8 +783,10 @@ public:
if (patternProperties_) { if (patternProperties_) {
context.patternPropertiesSchemaCount = 0; context.patternPropertiesSchemaCount = 0;
for (SizeType i = 0; i < patternPropertyCount_; i++) for (SizeType i = 0; i < patternPropertyCount_; i++)
if (patternProperties_[i].pattern && IsPatternMatch(patternProperties_[i].pattern, str, len)) if (patternProperties_[i].pattern && IsPatternMatch(patternProperties_[i].pattern, str, len)) {
context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = patternProperties_[i].schema; context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = patternProperties_[i].schema;
context.valueSchema = typeless_;
}
} }
SizeType index; SizeType index;

7
test/unittest/schematest.cpp
View File

@ -1322,6 +1322,13 @@ TEST(SchemaValidator, Issue728_AllOfRef) {
VALIDATE(s, "{\"key1\": \"abc\", \"key2\": \"def\"}", true); VALIDATE(s, "{\"key1\": \"abc\", \"key2\": \"def\"}", true);
} }
TEST(SchemaValidator, Issue825) {
Document sd;
sd.Parse("{\"type\": \"object\", \"additionalProperties\": false, \"patternProperties\": {\"^i\": { \"type\": \"string\" } } }");
SchemaDocument s(sd);
VALIDATE(s, "{ \"item\": \"hello\" }", true);
}
#ifdef __clang__ #ifdef __clang__
RAPIDJSON_DIAG_POP RAPIDJSON_DIAG_POP
#endif #endif