Merge pull request #177 from WillAbides/valid

Make Valid more consistent with "encoding/json"
goccy · Apr 10, 2021 · 8bc5727 · 8bc5727
2 parents ca141f3 + 4cae8f7
commit 8bc5727
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/json.go b/json.go
@@ -333,8 +333,13 @@ func HTMLEscape(dst *bytes.Buffer, src []byte) {
 // Valid reports whether data is a valid JSON encoding.
 func Valid(data []byte) bool {
 	var v interface{}
-	if err := Unmarshal(data, &v); err != nil {
+	decoder := NewDecoder(bytes.NewReader(data))
+	err := decoder.Decode(&v)
+	if err != nil {
 		return false
 	}
-	return true
+	if !decoder.More() {
+		return true
+	}
+	return decoder.InputOffset() >= int64(len(data))
 }
diff --git a/json_test.go b/json_test.go
@@ -20,6 +20,7 @@ var validTests = []struct {
 	{`{}`, true},
 	{`{"foo":"bar"}`, true},
 	{`{"foo":"bar","bar":{"baz":["qux"]}}`, true},
+	{`[""],`, false},
 }
 
 func TestValid(t *testing.T) {