From 1bc6bca478872347faa32371663b3aff7b00624f Mon Sep 17 00:00:00 2001 From: Ariel Davis Date: Sat, 6 May 2023 15:05:03 -0700 Subject: [PATCH] Use checked --- lib/line-index/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/line-index/src/lib.rs b/lib/line-index/src/lib.rs index 6318cbde50..622738ce8f 100644 --- a/lib/line-index/src/lib.rs +++ b/lib/line-index/src/lib.rs @@ -184,7 +184,7 @@ impl LineIndex { if let Some(wide_chars) = self.line_wide_chars.get(&line_col.line) { for c in wide_chars.iter() { if u32::from(c.end) <= line_col.col { - col -= u32::from(c.len()) - c.wide_len(enc); + col = col.checked_sub(u32::from(c.len()) - c.wide_len(enc))?; } else { // From here on, all utf16 characters come *after* the character we are mapping, // so we don't need to take them into account @@ -201,7 +201,7 @@ impl LineIndex { if let Some(wide_chars) = self.line_wide_chars.get(&line_col.line) { for c in wide_chars.iter() { if col > u32::from(c.start) { - col += u32::from(c.len()) - c.wide_len(enc) as u32; + col = col.checked_add(u32::from(c.len()) - c.wide_len(enc))?; } else { // From here on, all utf16 characters come *after* the character we are mapping, // so we don't need to take them into account