From 036964b4a7c131da03ed9bdbf1f6ea2a8fc26eed Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 29 Jan 2019 21:26:17 +0000 Subject: [PATCH] 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 --- models/issue_mail.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/issue_mail.go b/models/issue_mail.go index 78dbd13def..b807e52281 100644 --- 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) }