Don't slice midway through multi-byte char when detecting line ending

2022-07-06 10:21:30 +02:00
parent 5e2306d0e0
commit 113eb9b94f
2 changed files with 18 additions and 3 deletions
@@ -2353,9 +2353,13 @@ impl LineEnding {
    }

    pub fn detect(text: &str) -> Self {
-        if let Some(ix) = text[..cmp::min(text.len(), 1000)].find(&['\n']) {
-            let text = text.as_bytes();
-            if ix > 0 && text[ix - 1] == b'\r' {
+        let mut max_ix = cmp::min(text.len(), 1000);
+        while !text.is_char_boundary(max_ix) {
+            max_ix -= 1;
+        }
+
+        if let Some(ix) = text[..max_ix].find(&['\n']) {
+            if ix > 0 && text.as_bytes()[ix - 1] == b'\r' {
                Self::Windows
            } else {
                Self::Unix