Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add safety for negative indexes in HTML renderer

Browse Source
This commit is contained in:
Tulir Asokan 2023-01-15 15:57:34 +02:00
parent d6c08dc134
commit 2751b186fa
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/messages/html/list.go
View File

@ -66,6 +66,14 @@ func (le *ListEntity) Clone() Entity {
} }
} }
func (le *ListEntity) paddingFor(number int) string {
padding := le.Indent - 2 - format.Digits(number)
if padding <= 0 {
return ""
}
return strings.Repeat(" ", padding)
}
func (le *ListEntity) Draw(screen mauview.Screen, ctx DrawContext) { func (le *ListEntity) Draw(screen mauview.Screen, ctx DrawContext) {
width, _ := screen.Size() width, _ := screen.Size()
@ -74,7 +82,7 @@ func (le *ListEntity) Draw(screen mauview.Screen, ctx DrawContext) {
proxyScreen.Height = entity.Height() proxyScreen.Height = entity.Height()
if le.Ordered { if le.Ordered {
number := le.Start + i number := le.Start + i
line := fmt.Sprintf("%d. %s", number, strings.Repeat(" ", le.Indent-2-format.Digits(number))) line := fmt.Sprintf("%d. %s", number, le.paddingFor(number))
widget.WriteLine(screen, mauview.AlignLeft, line, 0, proxyScreen.OffsetY, le.Indent, le.Style) widget.WriteLine(screen, mauview.AlignLeft, line, 0, proxyScreen.OffsetY, le.Indent, le.Style)
} else { } else {
screen.SetContent(0, proxyScreen.OffsetY, '●', nil, le.Style) screen.SetContent(0, proxyScreen.OffsetY, '●', nil, le.Style)
@ -94,7 +102,7 @@ func (le *ListEntity) PlainText() string {
indent := strings.Repeat(" ", le.Indent) indent := strings.Repeat(" ", le.Indent)
if le.Ordered { if le.Ordered {
number := le.Start + i number := le.Start + i
_, _ = fmt.Fprintf(&buf, "%d. %s", number, strings.Repeat(" ", le.Indent-2-format.Digits(number))) _, _ = fmt.Fprintf(&buf, "%d. %s", number, le.paddingFor(number))
} else { } else {
buf.WriteString("● ") buf.WriteString("● ")
} }