Skip to content

Commit 14b0a7a

Browse files
committed
Prevent adding nil label to .AddedLabels or .RemovedLabels
There are possibly a few old databases out there with malmigrated data that can cause panics with empty labels being migrated. This PR adds a few tests to prevent nil labels being added. Fix go-gitea#14466 Signed-off-by: Andrew Thornton <[email protected]>
1 parent b337c60 commit 14b0a7a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

modules/templates/helper.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,10 @@ func NewFuncMap() []template.FuncMap {
371371
"RenderLabels": func(labels []*models.Label) template.HTML {
372372
html := `<span class="labels-list">`
373373
for _, label := range labels {
374+
// Protect against nil value in labels - shouldn't happen but would cause a panic if so
375+
if label == nil {
376+
continue
377+
}
374378
html += fmt.Sprintf("<div class='ui label' style='color: %s; background-color: %s'>%s</div> ",
375379
label.ForegroundColor(), label.Color, RenderEmoji(label.Name))
376380
}

routers/repo/issue.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2464,7 +2464,7 @@ func combineLabelComments(issue *models.Issue) {
24642464
if i == 0 || cur.Type != models.CommentTypeLabel ||
24652465
(prev != nil && prev.PosterID != cur.PosterID) ||
24662466
(prev != nil && cur.CreatedUnix-prev.CreatedUnix >= 60) {
2467-
if cur.Type == models.CommentTypeLabel {
2467+
if cur.Type == models.CommentTypeLabel && cur.Label != nil {
24682468
if cur.Content != "1" {
24692469
cur.RemovedLabels = append(cur.RemovedLabels, cur.Label)
24702470
} else {
@@ -2474,10 +2474,12 @@ func combineLabelComments(issue *models.Issue) {
24742474
continue
24752475
}
24762476

2477-
if cur.Content != "1" {
2478-
prev.RemovedLabels = append(prev.RemovedLabels, cur.Label)
2479-
} else {
2480-
prev.AddedLabels = append(prev.AddedLabels, cur.Label)
2477+
if cur.Label != nil {
2478+
if cur.Content != "1" {
2479+
prev.RemovedLabels = append(prev.RemovedLabels, cur.Label)
2480+
} else {
2481+
prev.AddedLabels = append(prev.AddedLabels, cur.Label)
2482+
}
24812483
}
24822484
prev.CreatedUnix = cur.CreatedUnix
24832485
issue.Comments = append(issue.Comments[:i], issue.Comments[i+1:]...)

0 commit comments

Comments
 (0)