Auto merge of servo#129 - ak1t0:escape-between-U+0001-to-U+001f, r=SimonSapin

bors-servo · web-flow · commit 20b509a7d3ca · 2017-03-21T00:36:45.000-07:00
Character between U+0001 ~ U+001F in string should be escaped when serialized Fixes [servo/servo#15947](servo/servo#15947)  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/129)
diff --git a/src/serializer.rs b/src/serializer.rs
@@ -251,15 +251,19 @@ impl<'a, W> fmt::Write for CssStringWriter<'a, W> where W: fmt::Write {
         let mut chunk_start = 0;
         for (i, b) in s.bytes().enumerate() {
             let escaped = match b {
-                b'"' => "\\\"",
-                b'\\' => "\\\\",
-                b'\n' => "\\A ",
-                b'\r' => "\\D ",
-                b'\x0C' => "\\C ",
+                b'"' => Some("\\\""),
+                b'\\' => Some("\\\\"),
+                b'\n' => Some("\\A "),
+                b'\r' => Some("\\D "),
+                b'\0' => Some("\u{FFFD}"),
+                b'\x01'...b'\x1F' | b'\x7F' => None,
                 _ => continue,
             };
             try!(self.inner.write_str(&s[chunk_start..i]));
-            try!(self.inner.write_str(escaped));
+            match escaped {
+                Some(x) => try!(self.inner.write_str(x)),
+                None => try!(write!(self.inner, "\\{:x} ", b)),
+            };
             chunk_start = i + 1;
         }
         self.inner.write_str(&s[chunk_start..])
