Skip to content

Fix possible panic #17694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 18, 2021
Merged

Fix possible panic #17694

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b43eadb
Fix possible panic
Nov 17, 2021
8b2229c
Handle len(link) == 1 case
Nov 17, 2021
47f7c68
Add comment
Nov 17, 2021
59f7008
Merge branch 'main' into fix-offBy1
Nov 18, 2021
0412b8f
Merge branch 'main' into fix-offBy1
lunny Nov 18, 2021
d7fa56b
Simplify
Nov 18, 2021
7a69970
Update repo_avatar.go
wxiaoguang Nov 18, 2021
41ac404
Merge branch 'main' into fix-offBy1
wxiaoguang Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions models/repo_avatar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,11 @@ func (repo *Repository) AvatarLink() string {
// avatarLink returns user avatar absolute link.
func (repo *Repository) avatarLink(e db.Engine) string {
link := repo.relAvatarLink(e)
// link may be empty!
if len(link) > 0 {
if link[0] == '/' && link[1] != '/' {
return setting.AppURL + strings.TrimPrefix(link, setting.AppSubURL)[1:]
}
// we only prepend our AppURL to our known (relative, internal) avatar link to get an absolute URL
if strings.HasPrefix(link, "/") && !strings.HasPrefix(link, "//") {
return setting.AppURL + strings.TrimPrefix(link, setting.AppSubURL)[1:]
}
// otherwise, return the link as it is
return link
}

Expand Down