Commit0fa7148

authored

Merge pull request#138 from cardigan1008/issue-overflow

Fix arithmetic overflow panics

2 parents2081c29 +164f787 commit0fa7148Copy full SHA for 0fa7148

File tree

1 file changed

-6

lines changed

src
- grapheme.rs

1 file changed

-6

lines changed

`‎src/grapheme.rs‎`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ impl GraphemeCursor {`
`412`	`412`	/// ```
`413`	`413`	`pubfnprovide_context(&mutself,chunk:&str,chunk_start:usize){`
`414`	`414`	`usecrate::tables::graphemeas gr;`
`415`		`-assert!(chunk_start +chunk.len() ==self.pre_context_offset.unwrap());`
	`415`	`+assert!(chunk_start.saturating_add(chunk.len()) ==self.pre_context_offset.unwrap());`
`416`	`416`	`self.pre_context_offset =None;`
`417`	`417`	`ifself.is_extended && chunk_start + chunk.len() ==self.offset{`
`418`	`418`	`let ch = chunk.chars().next_back().unwrap();`
`@@ -598,15 +598,15 @@ impl GraphemeCursor {`
`598`	`598`	`ifself.state ==GraphemeState::NotBreak{`
`599`	`599`	`returnOk(false);`
`600`	`600`	`}`
`601`		`-if(self.offset < chunk_start \|\|self.offset >= chunk_start +chunk.len())`
`602`		`- &&(self.offset > chunk_start +chunk.len() \|\|self.cat_after.is_none())`
	`601`	`+if(self.offset < chunk_start \|\|self.offset >= chunk_start.saturating_add(chunk.len()))`
	`602`	`+ &&(self.offset > chunk_start.saturating_add(chunk.len()) \|\|self.cat_after.is_none())`
`603`	`603`	`{`
`604`	`604`	`returnErr(GraphemeIncomplete::InvalidOffset);`
`605`	`605`	`}`
`606`	`606`	`ifletSome(pre_context_offset) =self.pre_context_offset{`
`607`	`607`	`returnErr(GraphemeIncomplete::PreContext(pre_context_offset));`
`608`	`608`	`}`
`609`		`-let offset_in_chunk =self.offset -chunk_start;`
	`609`	`+let offset_in_chunk =self.offset.saturating_sub(chunk_start);`
`610`	`610`	`ifself.cat_after.is_none(){`
`611`	`611`	`let ch = chunk[offset_in_chunk..].chars().next().unwrap();`
`612`	`612`	`self.cat_after =Some(self.grapheme_category(ch));`
`@@ -702,7 +702,7 @@ impl GraphemeCursor {`
`702`	`702`	`self.cat_after =Some(self.grapheme_category(ch));`
`703`	`703`	`}`
`704`	`704`	`}else{`
`705`		`-self.offset+=ch.len_utf8();`
	`705`	`+self.offset=self.offset.saturating_add(ch.len_utf8());`
`706`	`706`	`self.state =GraphemeState::Unknown;`
`707`	`707`	`self.cat_before =self.cat_after.take();`
`708`	`708`	`ifself.cat_before.is_none(){`
`@@ -781,7 +781,9 @@ impl GraphemeCursor {`
`781`	`781`	`ifself.offset == chunk_start{`
`782`	`782`	`returnErr(GraphemeIncomplete::PrevChunk);`
`783`	`783`	`}`
`784`		`-letmut iter = chunk[..self.offset - chunk_start].chars().rev();`
	`784`	`+letmut iter = chunk[..self.offset.saturating_sub(chunk_start)]`
	`785`	`+.chars()`
	`786`	`+.rev();`
`785`	`787`	`letmut ch = iter.next().unwrap();`
`786`	`788`	`loop{`
`787`	`789`	`ifself.offset == chunk_start{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0fa7148

File tree

1 file changed

1 file changed

`‎src/grapheme.rs‎`

0 commit comments