Skip to content

Commit

Permalink
Prevent NPE if gitea uploader fails to open url (#18080) (#18101)
Browse files Browse the repository at this point in the history
Backport #18080

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>
  • Loading branch information
zeripath authored Dec 26, 2021
1 parent 012e45a commit afe9d2c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion modules/uri/uri.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ func Open(uriStr string) (io.ReadCloser, error) {
switch strings.ToLower(u.Scheme) {
case "http", "https":
f, err := http.Get(uriStr)
return f.Body, err
if err != nil {
return nil, err
}
return f.Body, nil
case "file":
return os.Open(u.Path)
default:
Expand Down

0 comments on commit afe9d2c

Please sign in to comment.