Minor simplifications

Author: evanphx

v5/merge.go

@@ -120,12 +120,16 @@ func MergePatch(docData, patchData []byte) ([]byte, error) {
 }
 
 func doMergePatch(docData, patchData []byte, mergeMerge bool) ([]byte, error) {
-doc := &partialDoc{}
+if !json.Valid(docData) {
+return nil, errBadJSONDoc
+}
 
-if !json.Valid(docData) || !json.Valid(patchData) {
-return nil, ErrInvalid
+if !json.Valid(patchData) {
+return nil, errBadJSONPatch
 }
 
+doc := &partialDoc{}
+
 docErr := doc.UnmarshalJSON(docData)
 
 patch := &partialDoc{}
@@ -137,22 +141,15 @@ func doMergePatch(docData, patchData []byte, mergeMerge bool) ([]byte, error) {
 }
 
 if isSyntaxError(patchErr) {
-if json.Valid(patchData) {
-return patchData, nil
-}
-
-return nil, errBadJSONPatch
+return patchData, nil
 }
 
 if docErr == nil && doc.obj == nil {
 return nil, errBadJSONDoc
 }
 
 if patchErr == nil && patch.obj == nil {
-if json.Valid(patchData) {
-return patchData, nil
-}
-return nil, errBadJSONPatch
+return patchData, nil
 }
 
 if docErr != nil || patchErr != nil {