Merge pull request #4 from lefinal/fix-raw-message-issues

fix: raw json raw message treating null as valid again
lefinal · Jun 20, 2022 · 8374689 · 8374689
2 parents b0ec9be + abee5e9
commit 8374689
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/json_raw_message.go b/json_raw_message.go
@@ -35,7 +35,7 @@ func (rm JSONRawMessage) MarshalJSON() ([]byte, error) {
 // UnmarshalJSON as json.RawMessage or sets Valid to false if empty.
 func (rm *JSONRawMessage) UnmarshalJSON(data []byte) error {
 	// Do NOT use regular NULL-check here.
-	if data == nil {
+	if isNull(data) {
 		rm.Valid = false
 		rm.RawMessage = nil
 		return nil

diff --git a/json_raw_message_test.go b/json_raw_message_test.go
@@ -73,7 +73,7 @@ func (suite *JSONRawMessageUnmarshalJSONSuite) TestNull() {
 	}
 	err := json.Unmarshal([]byte(`{"rm": null}`), &s)
 	suite.Require().NoError(err, "should not fail")
-	suite.True(s.RM.Valid, "should not be valid")
+	suite.False(s.RM.Valid, "should not be valid")
 }
 
 func (suite *JSONRawMessageUnmarshalJSONSuite) TestOK() {