Ensure issue.Poster is loaded in mailIssueCommentToParticipants

zeripath · zeripath · commit be414361f682 · 2019-01-29T19:52:03.000Z
Previous code could potentially dereference nil - this PR ensures
that the poster is loaded before dereferencing it.

Signed-off-by: Andrew Thornton &lt;art27@cantab.net&gt;
diff --git a/models/issue_mail.go b/models/issue_mail.go
@@ -39,11 +39,11 @@ func mailIssueCommentToParticipants(e Engine, issue *Issue, doer *User, content
 
 	// In case the issue poster is not watching the repository and is active,
 	// even if we have duplicated in watchers, can be safely filtered out.
-	poster, err := getUserByID(e, issue.PosterID)
+	err = issue.loadPoster(e)
 	if err != nil {
 		return fmt.Errorf("GetUserByID [%d]: %v", issue.PosterID, err)
 	}
-	if issue.PosterID != doer.ID && poster.IsActive && !poster.ProhibitLogin {
+	if issue.PosterID != doer.ID && issue.Poster.IsActive && !issue.Poster.ProhibitLogin {
 		participants = append(participants, issue.Poster)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,11 @@ func mailIssueCommentToParticipants(e Engine, issue Issue, doer User, content`
`39`	`39`
`40`	`40`	`// In case the issue poster is not watching the repository and is active,`
`41`	`41`	`// even if we have duplicated in watchers, can be safely filtered out.`
`42`		`- poster, err := getUserByID(e, issue.PosterID)`
	`42`	`+ err = issue.loadPoster(e)`
`43`	`43`	`if err != nil {`
`44`	`44`	`return fmt.Errorf("GetUserByID [%d]: %v", issue.PosterID, err)`
`45`	`45`	`}`
`46`		`- if issue.PosterID != doer.ID && poster.IsActive && !poster.ProhibitLogin {`
	`46`	`+ if issue.PosterID != doer.ID && issue.Poster.IsActive && !issue.Poster.ProhibitLogin {`
`47`	`47`	`participants = append(participants, issue.Poster)`
`48`	`48`	`}`
`49`	`49`