Skip to content
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.

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

Ensure repo is loaded in mailer (Completely fix #5891) #5895

Merged

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Jan 29, 2019

Although it appears that the master branch is currently protected against the nil dereference bug referred to in #5891 - looking closer at the functions this calls these expect that the repo is loaded in the issue, which may not be available.

This fix ensures that the repo is loaded before calling these methods meaning that any future changes will be protected against a nil dereference. (We should probably also "MustRepo" in those downstream functions - however, injudicious use could cause deadlocks.)

Signed-off-by: Andrew Thornton [email protected]

Signed-off-by: Andrew Thornton <[email protected]>
@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (master@002e898). Click here to learn what that means.
The diff coverage is 0%.

Impacted file tree graph

@@           Coverage Diff            @@
##             master   #5895   +/-   ##
========================================
  Coverage          ?     38%           
========================================
  Files             ?     328           
  Lines             ?   48331           
  Branches          ?       0           
========================================
  Hits              ?   18370           
  Misses            ?   27322           
  Partials          ?    2639
Impacted Files Coverage Δ
models/issue_mail.go 11.53% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 002e898...c914f48. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 29, 2019
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 29, 2019
@techknowlogick techknowlogick added this to the 1.8.0 milestone Jan 29, 2019
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 29, 2019
@zeripath zeripath merged commit 2569363 into go-gitea:master Jan 29, 2019
zeripath added a commit that referenced this pull request Jan 29, 2019
…) (#5894)

* Ensure issue.Poster is loaded in mailIssueCommentToParticipants (#5891)

Previous code could potentially dereference nil - this PR ensures
that the poster is loaded before dereferencing it.

Signed-off-by: Andrew Thornton <[email protected]>

* Also ensure the repo is loaded

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath deleted the completely-fix-dereference-bugs-mailer branch January 29, 2019 23:56
@zeripath zeripath added the backport/done All backports for this PR have been created label Jan 29, 2019
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants