Relativize: avoid panic in case of shared UTF-8 prefix

oxigraph · Dec 21, 2024 · 30f81c7 · 30f81c7
1 parent 8305079
commit 30f81c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,6 @@ serde = { version = "1.0.166", optional = true }
 [dev-dependencies]
 codspeed-criterion-compat = "2.3.3"
 serde_test = "1"
-clap = "4"
 
 [[bench]]
 name = "lib"

diff --git a/src/lib.rs b/src/lib.rs
@@ -703,10 +703,11 @@ impl<T: Deref<Target = str>> Iri<T> {
         }
         if abs_path != base_path || abs_query.is_none() && base_query.is_some() {
             let number_of_shared_characters = abs_path
-                .bytes()
-                .zip(base_path.bytes())
+                .chars()
+                .zip(base_path.chars())
                 .take_while(|(l, r)| l == r)
-                .count();
+                .map(|(l, _)| l.len_utf8())
+                .sum::<usize>();
             // We decrease until finding a /
             let number_of_shared_characters = abs_path[..number_of_shared_characters]
                 .rfind('/')