From 60d3577b596eb70f3b1b19f0ee7e484fbb45d04e Mon Sep 17 00:00:00 2001 From: Johan Walles Date: Sat, 18 May 2024 07:59:44 +0200 Subject: [PATCH] Don't crash searching in empty buffer --- m/search.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/m/search.go b/m/search.go index 273e556..42cea77 100644 --- a/m/search.go +++ b/m/search.go @@ -15,10 +15,16 @@ func (p *Pager) scrollToSearchHits() { return } - firstHitPosition := p.findFirstHit(*p.scrollPosition.lineNumber(p), nil, false) + lineNumber := p.scrollPosition.lineNumber(p) + if lineNumber == nil { + // No lines to search + return + } + + firstHitPosition := p.findFirstHit(*lineNumber, nil, false) if firstHitPosition == nil { // Try again from the top - firstHitPosition = p.findFirstHit(linenumbers.LineNumber{}, p.scrollPosition.lineNumber(p), false) + firstHitPosition = p.findFirstHit(linenumbers.LineNumber{}, lineNumber, false) } if firstHitPosition == nil { // No match, give up