fix: Invalid handling of double-quoted property values like in font-family: "Open Sans"

Ref: #129

Author: Stranger6667

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Invalid handling of double-quoted property values like in `font-family: "Open Sans"`. [#129](https://github.com/Stranger6667/css-inline/issues/129)
+
 ### Performance
 
 - Use `std::fs::read_to_string` in CLI to avoid over/under allocating of the input buffer.

bindings/python/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Invalid handling of double-quoted property values like in `font-family: "Open Sans"`. [#129](https://github.com/Stranger6667/css-inline/issues/129)
+
 ## [0.7.7] - 2022-01-07
 
 ### Added

bindings/wasm/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Invalid handling of double-quoted property values like in `font-family: "Open Sans"`. [#129](https://github.com/Stranger6667/css-inline/issues/129)
+
 ## [0.7.5] - 2021-07-24
 
 ### Fixed

css-inline/Cargo.toml

@@ -21,6 +21,7 @@ cli = ["pico-args", "rayon"]
 [dependencies]
 cssparser = "0.29"
 kuchiki = "0.8"
+memchr = "2.4"
 attohttpc = { version = "0", default-features = false, features = ["compress", "tls-rustls"] }
 url = "2"
 smallvec = "1"

css-inline/src/lib.rs

@@ -118,6 +118,21 @@ use smallvec::{smallvec, SmallVec};
 use std::{borrow::Cow, collections::hash_map::Entry, fs, io::Write};
 pub use url::{ParseError, Url};
 
+/// Replace double quotes in property values.
+///
+/// This implementation is deliberately simplistic and covers only `font-family`, but escaping
+/// might be needed in other properties that accept strings.
+macro_rules! replace_double_quotes {
+    ($target:expr, $name:expr, $value:expr) => {
+        // Avoid allocation if there is no double quote in the input string
+        if $name.starts_with("font-family") && memchr::memchr(b'"', $value.as_bytes()).is_some() {
+            $target.push_str(&$value.replace('"', "\'"))
+        } else {
+            $target.push_str($value)
+        };
+    };
+}
+
 /// Configuration options for CSS inlining process.
 #[derive(Debug)]
 pub struct InlineOptions<'a> {
@@ -352,7 +367,7 @@ impl<'a> CSSInliner<'a> {
                     for (name, (_, value)) in styles {
                         final_styles.push_str(name.as_str());
                         final_styles.push(':');
-                        final_styles.push_str(value.as_str());
+                        replace_double_quotes!(final_styles, name, &value);
                         final_styles.push(';');
                     }
                     attributes.insert("style", final_styles);
@@ -472,7 +487,7 @@ fn merge_styles(
         let (name, value) = declaration?;
         final_styles.push_str(&name);
         final_styles.push(':');
-        final_styles.push_str(value);
+        replace_double_quotes!(final_styles, name, value);
         final_styles.push(';');
         // This property won't be taken from new styles
         buffer.push(name.to_string())
@@ -481,7 +496,7 @@ fn merge_styles(
         if !buffer.contains(property) {
             final_styles.push_str(property);
             final_styles.push(':');
-            final_styles.push_str(value);
+            replace_double_quotes!(final_styles, property, value);
             final_styles.push(';');
         }
     }

css-inline/tests/test_inlining.rs

@@ -68,6 +68,17 @@ fn overloaded_styles() {
     )
 }
 
+#[test]
+fn font_family_quoted() {
+    // When property value contains double quotes
+    assert_inlined!(
+        style = r#"h1 { font-family: "Open Sans", sans-serif; }"#,
+        body = r#"<h1>Hello world!</h1>"#,
+        // Then it should be replaced with single quotes
+        expected = r#"<h1 style="font-family: 'Open Sans', sans-serif;">Hello world!</h1>"#
+    )
+}
+
 #[test]
 fn existing_styles() {
     // When there is a `style` attribute on a tag that contains a rule