mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-26 18:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent NPE if gitea uploader fails to open url (#18080)

Browse source 
If http.Get() returns an error return nil and err before attempting to
use the broken file.

Thanks to walker xiong for spotting this bug.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-12-23 16:27:33 +00:00 committed by GitHub
parent ffc08c1914
commit a5df7ba6bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/uri/uri.go
View file

@ -31,7 +31,10 @@ func Open(uriStr string) (io.ReadCloser, error) {
switch strings.ToLower(u.Scheme) { switch strings.ToLower(u.Scheme) {
case "http", "https": case "http", "https":
f, err := http.Get(uriStr) f, err := http.Get(uriStr)
return f.Body, err if err != nil {
return nil, err
}
return f.Body, nil
case "file": case "file":
return os.Open(u.Path) return os.Open(u.Path)
default: default: