Skip to content

🎧 Your Personal Streaming Service

Don't swallow marshalling errors in the Subsonic API

Deluan0b2cf3009676
diff --git a/server/subsonic/api.go b/server/subsonic/api.go
index 0f8c909f8..18ac2da68 100644
--- a/server/subsonic/api.go
+++ b/server/subsonic/api.go
@@ -286,20 +286,24 @@ func sendResponse(w http.ResponseWriter, r *http.Request, payload *responses.Sub
p := req.Params(r)
f, _ := p.String("f")
var response []byte
+ var err error
switch f {
case "json":
w.Header().Set("Content-Type", "application/json")
wrapper := &responses.JsonWrapper{Subsonic: *payload}
- response, _ = json.Marshal(wrapper)
+ response, err = json.Marshal(wrapper)
case "jsonp":
w.Header().Set("Content-Type", "application/javascript")
callback, _ := p.String("callback")
wrapper := &responses.JsonWrapper{Subsonic: *payload}
- data, _ := json.Marshal(wrapper)
- response = []byte(fmt.Sprintf("%s(%s)", callback, data))
+ response, err = json.Marshal(wrapper)
+ response = []byte(fmt.Sprintf("%s(%s)", callback, response))
default:
w.Header().Set("Content-Type", "application/xml")
- response, _ = xml.Marshal(payload)
+ response, err = xml.Marshal(payload)
+ }
+ if err != nil {
+ log.Error(r.Context(), "Error marshalling response", "format", f, err)
}
if payload.Status == "ok" {
if log.IsGreaterOrEqualTo(log.LevelTrace) {