From b94342c52bedff1ce77fb348351f9e2f1a6790d4 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Thu, 27 Aug 2020 17:27:45 +0300 Subject: [PATCH] themes/regexp: fix unwrap check on regexp match byte offsets --- src/conf/themes.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/conf/themes.rs b/src/conf/themes.rs index 1c83262d..1568c587 100644 --- a/src/conf/themes.rs +++ b/src/conf/themes.rs @@ -609,8 +609,17 @@ mod regexp { } let next_byte_offset = next_byte_offset.unwrap(); - while next_byte_offset.start() < self.char_indices.next().unwrap().0 { + let mut next_char_index = self.char_indices.next(); + if next_char_index.is_none() { + return None; + } + + while next_byte_offset.start() < next_char_index.unwrap().0 { self.char_offset += 1; + next_char_index = self.char_indices.next(); + if next_char_index.is_none() { + return None; + } } let start = self.char_offset;