unmarshal: no err if second json is invalid

closes issue #161
santhosh-tekuri · Apr 23, 2024 · 620600d · 620600d
1 parent 8b4b36a
commit 620600d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/resource.go b/resource.go
@@ -270,8 +270,8 @@ func unmarshal(r io.Reader) (interface{}, error) {
 	if err := decoder.Decode(&doc); err != nil {
 		return nil, err
 	}
-	if t, _ := decoder.Token(); t != nil {
-		return nil, fmt.Errorf("invalid character %v after top-level value", t)
+	if _, err := decoder.Token(); err == nil || err != io.EOF {
+		return nil, fmt.Errorf("invalid character after top-level value")
 	}
 	return doc, nil
 }
diff --git a/schema_test.go b/schema_test.go
@@ -310,6 +310,14 @@ func TestInvalidSchema(t *testing.T) {
 		}
 	})
 
+	t.Run("invalid-second json", func(t *testing.T) {
+		if err := jsonschema.NewCompiler().AddResource("test.json", strings.NewReader("{}A")); err == nil {
+			t.Error("error expected")
+		} else {
+			t.Logf("%v", err)
+		}
+	})
+
 	t.Run("multiple json", func(t *testing.T) {
 		if err := jsonschema.NewCompiler().AddResource("test.json", strings.NewReader("{}{}")); err == nil {
 			t.Error("error expected")