0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-17 15:31:06 +01:00

Check for context exceeded in WalkGitLog (#17319)

There is a slight race in checking of a context deadline exceed in #16467
which leads to a 500 on the repository page.

The solution is to check the error coming back from `*LogNameStatusRepoParser.Next()`
and if it is the `ContextDeadlineExceeded` break from the loop.

Fix #17314

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-10-15 19:41:34 +01:00 committed by GitHub
parent a889d0cc8c
commit 58cd55d353
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -350,6 +350,9 @@ heaploop:
} }
current, err := g.Next(treepath, path2idx, changed, maxpathlen) current, err := g.Next(treepath, path2idx, changed, maxpathlen)
if err != nil { if err != nil {
if err == context.DeadlineExceeded {
break heaploop
}
g.Close() g.Close()
return nil, err return nil, err
} }