Skip to content

Place wrapper around comment as diff to catch panics #15085

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
zeripath merged 5 commits into from
Mar 21, 2021
Merged

Place wrapper around comment as diff to catch panics #15085

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1de15c
Place wrapper around comment as diff to prevent panics
zeripath Mar 21, 2021
7ebc23c
propagate the panic up
zeripath Mar 21, 2021
0701cc7
Merge branch 'master' into comment-as-diff-panic-wrapper
6543 Mar 21, 2021
455f26a
Do not propagate up panic
zeripath Mar 21, 2021
dbe032d
Merge branch 'master' into comment-as-diff-panic-wrapper
6543 Mar 21, 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
8 changes: 8 additions & 0 deletions services/gitdiff/gitdiff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,14 @@ func CommentAsDiff(c *models.Comment) (*Diff, error) {

// CommentMustAsDiff executes AsDiff and logs the error instead of returning
func CommentMustAsDiff(c *models.Comment) *Diff {
if c == nil {
return nil
}
defer func() {
if err := recover(); err != nil {
log.Error("PANIC whilst retrieving diff for comment[%d] Error: %v\nStack: %s", c.ID, err, log.Stack(2))
}
}()
diff, err := CommentAsDiff(c)
if err != nil {
log.Warn("CommentMustAsDiff: %v", err)
Expand Down