1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-12-23 08:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic if upload name wasn't supplied (#351)

Browse Source
This commit is contained in:
Erik Johnston 2017-11-22 15:45:03 +00:00 committed by GitHub
parent f42f44391f
commit 0d72e34acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/github.com/matrix-org/dendrite/mediaapi/routing/upload.go
View File

@ -21,6 +21,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"path" "path"
"strings"
"github.com/matrix-org/dendrite/clientapi/jsonerror" "github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/common/config" "github.com/matrix-org/dendrite/common/config"
@ -188,7 +189,7 @@ func (r *uploadRequest) Validate(maxFileSizeBytes config.FileSizeBytes) *util.JS
JSON: jsonerror.Unknown("HTTP Content-Type request header must be set."), JSON: jsonerror.Unknown("HTTP Content-Type request header must be set."),
} }
} }
if r.MediaMetadata.UploadName[0] == '~' { if strings.HasPrefix(string(r.MediaMetadata.UploadName), "~") {
return &util.JSONResponse{ return &util.JSONResponse{
Code: 400, Code: 400,
JSON: jsonerror.Unknown("File name must not begin with '~'."), JSON: jsonerror.Unknown("File name must not begin with '~'."),