Merge pull request #1976 from peruginni/master

Added condition to check if HEX code contain only valid characters (issue #1015)
less · Jun 6, 2014 · c872caa · c872caa
2 parents cd63bc5 + a5406a9
commit c872caa
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/lib/less/parser.js b/lib/less/parser.js
@@ -960,6 +960,11 @@ less.Parser = function Parser(env) {
                     var rgb;
 
                     if (input.charAt(i) === '#' && (rgb = $re(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/))) {
+                        var colorCandidateString = rgb.input.match(/^#([\w]+).*/); // strip colons, brackets, whitespaces and other characters that should not definitely be part of color string
+                        colorCandidateString = colorCandidateString[1];
+                        if (!colorCandidateString.match(/^[A-Fa-f0-9]+$/)) { // verify if candidate consists only of allowed HEX characters
+                            error("Invalid HEX color code");
+                        } 
                         return new(tree.Color)(rgb[1]);
                     }
                 },

diff --git a/test/less/errors/color-invalid-hex-code.less b/test/less/errors/color-invalid-hex-code.less
@@ -0,0 +1,3 @@
+.a {
+    @wrongHEXColorCode: #DCALLB;
+}
diff --git a/test/less/errors/color-invalid-hex-code.txt b/test/less/errors/color-invalid-hex-code.txt
@@ -0,0 +1,4 @@
+SyntaxError: Invalid HEX color code in {path}color-invalid-hex-code.less on line 2, column 29:
+1 .a {
+2     @wrongHEXColorCode: #DCALLB;
+3 }
diff --git a/test/less/errors/color-invalid-hex-code2.less b/test/less/errors/color-invalid-hex-code2.less
@@ -0,0 +1,3 @@
+.a {
+    @wrongHEXColorCode: #fffblack;
+}
diff --git a/test/less/errors/color-invalid-hex-code2.txt b/test/less/errors/color-invalid-hex-code2.txt
@@ -0,0 +1,4 @@
+SyntaxError: Invalid HEX color code in {path}color-invalid-hex-code2.less on line 2, column 29:
+1 .a {
+2     @wrongHEXColorCode: #fffblack;
+3 }