gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(object): unmarshal may return nil althrough no error happend

Browse Source 
Signed-off-by: leonrayang <chl696@sina.com>
This commit is contained in:
leonrayang 2023-12-09 13:44:19 +08:00 committed by leonrayang
parent 8bb67c52ec
commit 7a739d82cf
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
objectnode/acl_api.go
View File

@ -17,6 +17,7 @@ package objectnode
import (
"encoding/json"
"encoding/xml"
"fmt"
"io"
"net/http"
"strings"
@ -196,6 +197,9 @@ func getObjectACL(vol *Volume, path string, needDefault bool) (*AccessControlPol
if err = json.Unmarshal(data, &acp); err != nil {
err = xml.Unmarshal(data, &acp)
}
if err == nil && acp == nil {
err = fmt.Errorf("data unmarshal failed")
}
} else if needDefault {
acp = CreateDefaultACL(vol.owner)
}