compile/fix: panic compiling non jsonschema resource

santhosh-tekuri · Sep 17, 2024 · 86cca28 · 86cca28
1 parent 7ae7ff9
commit 86cca28
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/compiler_test.go b/compiler_test.go
@@ -229,3 +229,15 @@ func TestCustomVocabSubschemaResource(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestNonJSONResource(t *testing.T) {
+	c := jsonschema.NewCompiler()
+	err := c.AddResource("schema.json", strings.NewReader("123"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = c.Compile("schema.json")
+	if err == nil {
+		t.Fatal("compile must fail")
+	}
+}
diff --git a/roots.go b/roots.go
@@ -79,7 +79,8 @@ func (rr *roots) collectResources(r *root, sch any, base url, schPtr jsonPointer
 }
 
 func (rr *roots) _collectResources(r *root, sch any, base url, schPtr jsonPointer, fallback dialect) error {
-	if _, ok := sch.(bool); ok {
+	obj, ok := sch.(map[string]any)
+	if !ok {
 		if schPtr.isEmpty() {
 			// root resource
 			res := newResource(schPtr, base)
@@ -88,10 +89,6 @@ func (rr *roots) _collectResources(r *root, sch any, base url, schPtr jsonPointe
 		}
 		return nil
 	}
-	obj, ok := sch.(map[string]any)
-	if !ok {
-		return nil
-	}
 
 	hasSchema := false
 	if sch, ok := obj["$schema"]; ok {