Skip to content

Commit fd33c26

Browse files
authored
Merge pull request #374 from zgyorffi/fix_nullpointer_if_no_items_schema
Skip validation of elements in array against additionalItems schema i…
2 parents a8dc686 + 56bd409 commit fd33c26

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

core/src/main/java/org/everit/json/schema/ArraySchemaValidatingVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public ArraySchemaValidatingVisitor(Object subject, ValidatingVisitor owner) {
9393
}
9494

9595
@Override void visitSchemaOfAdditionalItems(Schema schemaOfAdditionalItems) {
96-
if (schemaOfAdditionalItems == null) {
96+
if (schemaOfAdditionalItems == null || arraySchema.getItemSchemas() == null) {
9797
return;
9898
}
9999
int validationFrom = Math.min(subjectLength, arraySchema.getItemSchemas().size());

core/src/test/java/org/everit/json/schema/ArraySchemaTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ public void additionalItemsSchema() {
4141
.build().validate(ARRAYS.get("additionalItemsSchema"));
4242
}
4343

44+
@Test
45+
public void ignoreAdditionalItemsIfNoItemsSchema() {
46+
ArraySchema.builder()
47+
.schemaOfAdditionalItems(FalseSchema.INSTANCE)
48+
.build().validate(ARRAYS.get("noItemSchema"));
49+
}
50+
4451
@Test
4552
public void additionalItemsSchemaFailure() {
4653
NullSchema nullSchema = buildWithLocation(NullSchema.builder());

0 commit comments

Comments
 (0)