Don't accept an extra token at the end of transform property

servo · Jun 7, 2017 · 5106643 · 5106643
1 parent 0934df7
commit 5106643
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs
@@ -956,7 +956,7 @@ ${helpers.predefined_type("scroll-snap-coordinate",
 
         let mut result = Vec::new();
         loop {
-            let name = match input.expect_function() {
+            let name = match input.try(|i| i.expect_function()) {
                 Ok(name) => name,
                 Err(_) => break,
             };

diff --git a/tests/unit/style/parsing/box_.rs b/tests/unit/style/parsing/box_.rs
@@ -31,3 +31,10 @@ fn test_transform_translate() {
     assert!(parse(transform::parse, "translate(2px foo)").is_err());
     assert!(parse(transform::parse, "perspective(-10px)").is_err());
 }
+
+#[test]
+fn test_unexhausted_transform() {
+    use style::properties::longhands::transform;
+    assert_parser_exhausted!(transform::parse, "rotate(70deg)foo", false);
+    assert_parser_exhausted!(transform::parse, "rotate(70deg) foo", false);
+}