luke/qedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rope: fix bug in Slice() causing out-of-bounds access

Browse Source
This commit is contained in:
Luke I. Wilson 2021-04-01 16:14:39 -05:00
parent 2cd41fc62d
commit 25f5262b6a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/buffer/rope.go
View File

@ -97,11 +97,11 @@ func (b *RopeBuffer) Line(line int) []byte {
// inclusive bounds. The returned value may or may not be a copy of the data, // inclusive bounds. The returned value may or may not be a copy of the data,
// so do not write to it. // so do not write to it.
func (b *RopeBuffer) Slice(startLine, startCol, endLine, endCol int) []byte { func (b *RopeBuffer) Slice(startLine, startCol, endLine, endCol int) []byte {
endPos := b.LineColToPos(endLine, endCol)+1 endPos := b.LineColToPos(endLine, endCol)
if length := (*rope.Node)(b).Len(); endPos >= length { if length := (*rope.Node)(b).Len(); endPos >= length {
endPos = length-1 endPos = length-1
} }
return (*rope.Node)(b).Slice(b.LineColToPos(startLine, startCol), endPos) return (*rope.Node)(b).Slice(b.LineColToPos(startLine, startCol), endPos+1)
} }
// Bytes returns all of the bytes in the buffer. This function is very likely // Bytes returns all of the bytes in the buffer. This function is very likely