Properly escape anchor names (#1908)

getzola · Jun 21, 2022 · 4f6a1c6 · 4f6a1c6
1 parent afc6a71
commit 4f6a1c6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/components/utils/src/anchors.rs b/components/utils/src/anchors.rs
@@ -1,12 +1,14 @@
 use libs::regex::Regex;
+use libs::regex::escape;
 
 pub fn has_anchor_id(content: &str, anchor: &str) -> bool {
     let checks = anchor_id_checks(anchor);
     checks.is_match(content)
 }
 
 fn anchor_id_checks(anchor: &str) -> Regex {
-    Regex::new(&format!(r#"\s(?i)(id|name) *= *("|')*{}("|'| |>)+"#, anchor)).unwrap()
+    Regex::new(&format!(r#"\s(?i)(id|name) *= *("|')*{}("|'| |>)+"#,
+                        escape(anchor))).unwrap()
 }
 
 #[cfg(test)]
@@ -44,7 +46,11 @@ mod tests {
         assert!(m(r#"<a
 id="fred">"#));
 
+        // Escaped Anchors
+        assert!(check("fred?george", r#"<a id="fred?george">"#));
+        assert!(check("fred.george", r#"<a id="fred.george">"#));
+
         // Non matchers
-        assert!(!m(r#"<a notid="fred">"#))
+        assert!(!m(r#"<a notid="fred">"#));
     }
 }