Merge pull request #1779 from pavel-pimenov/fix-1778-part-1

fix 1778 (part 1)
Tencent · Feb 23, 2021 · b1a4d91 · b1a4d91
2 parents 8be6459 + 3a65e2d
commit b1a4d91
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/include/rapidjson/schema.h b/include/rapidjson/schema.h
@@ -504,12 +504,12 @@ class Schema {
             AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
             AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
             AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
-        }
 
-        if (const ValueType* v = GetMember(value, GetNotString())) {
+            if (const ValueType* v = GetMember(value, GetNotString())) {
             schemaDocument->CreateSchema(&not_, p.Append(GetNotString(), allocator_), *v, document);
             notValidatorIndex_ = validatorCount_;
             validatorCount_++;
+            }
         }
 
         // Object
@@ -953,7 +953,7 @@ class Schema {
         }
 
         if (additionalPropertiesSchema_) {
-            if (additionalPropertiesSchema_ && context.patternPropertiesSchemaCount > 0) {
+            if (context.patternPropertiesSchemaCount > 0) {
                 context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = additionalPropertiesSchema_;
                 context.valueSchema = typeless_;
                 context.valuePatternValidatorType = Context::kPatternValidatorWithAdditionalProperty;