Merge pull request #138 from cardigan1008/issue-overflow

Fix arithmetic overflow panics
unicode-rs · Jul 29, 2024 · 0fa7148 · 0fa7148
2 parents 2081c29 + 164f787
commit 0fa7148
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/grapheme.rs b/src/grapheme.rs
@@ -412,7 +412,7 @@ impl GraphemeCursor {
     /// ```
     pub fn provide_context(&mut self, chunk: &str, chunk_start: usize) {
         use crate::tables::grapheme as gr;
-        assert!(chunk_start + chunk.len() == self.pre_context_offset.unwrap());
+        assert!(chunk_start.saturating_add(chunk.len()) == self.pre_context_offset.unwrap());
         self.pre_context_offset = None;
         if self.is_extended && chunk_start + chunk.len() == self.offset {
             let ch = chunk.chars().next_back().unwrap();
@@ -598,15 +598,15 @@ impl GraphemeCursor {
         if self.state == GraphemeState::NotBreak {
             return Ok(false);
         }
-        if (self.offset < chunk_start || self.offset >= chunk_start + chunk.len())
-            && (self.offset > chunk_start + chunk.len() || self.cat_after.is_none())
+        if (self.offset < chunk_start || self.offset >= chunk_start.saturating_add(chunk.len()))
+            && (self.offset > chunk_start.saturating_add(chunk.len()) || self.cat_after.is_none())
         {
             return Err(GraphemeIncomplete::InvalidOffset);
         }
         if let Some(pre_context_offset) = self.pre_context_offset {
             return Err(GraphemeIncomplete::PreContext(pre_context_offset));
         }
-        let offset_in_chunk = self.offset - chunk_start;
+        let offset_in_chunk = self.offset.saturating_sub(chunk_start);
         if self.cat_after.is_none() {
             let ch = chunk[offset_in_chunk..].chars().next().unwrap();
             self.cat_after = Some(self.grapheme_category(ch));
@@ -702,7 +702,7 @@ impl GraphemeCursor {
                     self.cat_after = Some(self.grapheme_category(ch));
                 }
             } else {
-                self.offset += ch.len_utf8();
+                self.offset = self.offset.saturating_add(ch.len_utf8());
                 self.state = GraphemeState::Unknown;
                 self.cat_before = self.cat_after.take();
                 if self.cat_before.is_none() {
@@ -781,7 +781,9 @@ impl GraphemeCursor {
         if self.offset == chunk_start {
             return Err(GraphemeIncomplete::PrevChunk);
         }
-        let mut iter = chunk[..self.offset - chunk_start].chars().rev();
+        let mut iter = chunk[..self.offset.saturating_sub(chunk_start)]
+            .chars()
+            .rev();
         let mut ch = iter.next().unwrap();
         loop {
             if self.offset == chunk_start {