From e8ab61f4a0e6205bbed116ee7c172f22554ecb2e Mon Sep 17 00:00:00 2001 From: Evan Phoenix Date: Thu, 11 Jan 2024 17:59:57 -0800 Subject: [PATCH] Catch IO advancement errors as well --- v5/merge.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/v5/merge.go b/v5/merge.go index 2aee31d..369144e 100644 --- a/v5/merge.go +++ b/v5/merge.go @@ -3,7 +3,9 @@ package jsonpatch import ( "bytes" "encoding/json" + "errors" "fmt" + "io" "reflect" ) @@ -183,6 +185,12 @@ func doMergePatch(docData, patchData []byte, mergeMerge bool) ([]byte, error) { } func isSyntaxError(err error) bool { + if errors.Is(err, io.EOF) { + return true + } + if errors.Is(err, io.ErrUnexpectedEOF) { + return true + } if _, ok := err.(*json.SyntaxError); ok { return true }