From a812221ced16aad3f27949810f1109c39b7f63f7 Mon Sep 17 00:00:00 2001
From: Dmitry Savintsev <dmitris@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:26:18 +0200
Subject: [PATCH] Fix semgrep issue with dgryski Go ruleset (#3719)

---
 util/jsonutil/merge.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/jsonutil/merge.go b/util/jsonutil/merge.go
index e1d69cf1334..7900f78a4ff 100644
--- a/util/jsonutil/merge.go
+++ b/util/jsonutil/merge.go
@@ -30,12 +30,12 @@ func init() {
 // Fields of type json.RawMessage are merged rather than replaced.
 func MergeClone(v any, data json.RawMessage) error {
 	err := jsonConfigMergeClone.Unmarshal(data, v)
-	if err != nil {
-		return &errortypes.FailedToUnmarshal{
-			Message: tryExtractErrorMessage(err),
-		}
+	if err == nil {
+		return nil
+	}
+	return &errortypes.FailedToUnmarshal{
+		Message: tryExtractErrorMessage(err),
 	}
-	return err
 }
 
 type mergeCloneExtension struct {