From 46b3a71a1f30e0b518d7ec9d227adafa0e1e4b11 Mon Sep 17 00:00:00 2001 From: alingse Date: Sat, 29 Mar 2025 23:17:36 +0800 Subject: [PATCH] fix call writeJsonError with a nil value error after check another err (#6673) the dbErr != nil and err is nil when call writeJsonError with a nil value error, it may panic --- weed/server/filer_server_handlers_tagging.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weed/server/filer_server_handlers_tagging.go b/weed/server/filer_server_handlers_tagging.go index 8faa677e2..80ea09d53 100644 --- a/weed/server/filer_server_handlers_tagging.go +++ b/weed/server/filer_server_handlers_tagging.go @@ -45,7 +45,7 @@ func (fs *FilerServer) PutTaggingHandler(w http.ResponseWriter, r *http.Request) if dbErr := fs.filer.CreateEntry(ctx, existingEntry, false, false, nil, false, fs.filer.MaxFilenameLength); dbErr != nil { glog.V(0).Infof("failing to update %s tagging : %v", path, dbErr) - writeJsonError(w, r, http.StatusInternalServerError, err) + writeJsonError(w, r, http.StatusInternalServerError, dbErr) return } @@ -111,7 +111,7 @@ func (fs *FilerServer) DeleteTaggingHandler(w http.ResponseWriter, r *http.Reque if dbErr := fs.filer.CreateEntry(ctx, existingEntry, false, false, nil, false, fs.filer.MaxFilenameLength); dbErr != nil { glog.V(0).Infof("failing to delete %s tagging : %v", path, dbErr) - writeJsonError(w, r, http.StatusInternalServerError, err) + writeJsonError(w, r, http.StatusInternalServerError, dbErr) return }