Merge pull request #73 from divergentdave/escaped_char-unwraps

Remove three unwraps from escaped_char
kaj · May 14, 2020 · 3e610ca · 3e610ca
2 parents b6cb073 + 03c8f41
commit 3e610ca
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/src/parser/strings.rs b/src/parser/strings.rs
@@ -315,22 +315,22 @@ fn escaped_char(input: &[u8]) -> IResult<&[u8], char> {
         tag("\\"),
         alt((
             value('\\', tag("\\")),
-            map(
-                terminated(
-                    recognize(many_m_n(
-                        1,
-                        6,
-                        one_of("0123456789ABCDEFabcdef"),
-                    )),
-                    opt(tag(" ")),
+            map_opt(
+                map_res(
+                    map_res(
+                        terminated(
+                            recognize(many_m_n(
+                                1,
+                                6,
+                                one_of("0123456789ABCDEFabcdef"),
+                            )),
+                            opt(tag(" ")),
+                        ),
+                        input_to_str,
+                    ),
+                    |s| u32::from_str_radix(s, 16),
                 ),
-                |hp| {
-                    std::char::from_u32(
-                        u32::from_str_radix(input_to_str(hp).unwrap(), 16)
-                            .unwrap(),
-                    )
-                    .unwrap()
-                },
+                std::char::from_u32
             ),
             take_char,
         )),

diff --git a/tests/fuzz_cases.rs b/tests/fuzz_cases.rs
@@ -0,0 +1,10 @@
+use rsass::{compile_scss, output};
+
+#[test]
+fn bad_escape() {
+    let format = output::Format {
+        style: output::Style::Compressed,
+        precision: 5,
+    };
+    assert!(compile_scss(b"\\d00000", format).is_err());
+}