Merge pull request #374 from zgyorffi/fix_nullpointer_if_no_items_schema

Skip validation of elements in array against additionalItems schema i…
everit-org · Jul 7, 2020 · fd33c26 · fd33c26
2 parents a8dc686 + 56bd409
commit fd33c26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/src/main/java/org/everit/json/schema/ArraySchemaValidatingVisitor.java b/core/src/main/java/org/everit/json/schema/ArraySchemaValidatingVisitor.java
@@ -93,7 +93,7 @@ public ArraySchemaValidatingVisitor(Object subject, ValidatingVisitor owner) {
     }
 
     @Override void visitSchemaOfAdditionalItems(Schema schemaOfAdditionalItems) {
-        if (schemaOfAdditionalItems == null) {
+        if (schemaOfAdditionalItems == null || arraySchema.getItemSchemas() == null) {
             return;
         }
         int validationFrom = Math.min(subjectLength, arraySchema.getItemSchemas().size());

diff --git a/core/src/test/java/org/everit/json/schema/ArraySchemaTest.java b/core/src/test/java/org/everit/json/schema/ArraySchemaTest.java
@@ -41,6 +41,13 @@ public void additionalItemsSchema() {
                 .build().validate(ARRAYS.get("additionalItemsSchema"));
     }
 
+    @Test
+    public void ignoreAdditionalItemsIfNoItemsSchema() {
+        ArraySchema.builder()
+            .schemaOfAdditionalItems(FalseSchema.INSTANCE)
+            .build().validate(ARRAYS.get("noItemSchema"));
+    }
+
     @Test
     public void additionalItemsSchemaFailure() {
         NullSchema nullSchema = buildWithLocation(NullSchema.builder());