Merge pull request #2184 from xzyfer/fix/issue_2120

Fix parsing for urls with unicode characters
sass · Sep 22, 2016 · f99628d · f99628d
2 parents a782f52 + 7959cad
commit f99628d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/lexer.cpp b/src/lexer.cpp
@@ -81,19 +81,18 @@ namespace Sass {
     bool is_nonascii(const char& chr)
     {
       return (
-        (unsigned(chr) > 127 && unsigned(chr) < 55296) ||
-        (unsigned(chr) > 57343 && unsigned(chr) < 65534) ||
-        (unsigned(chr) > 65535 && unsigned(chr) < 1114111)
+        (unsigned(chr) >= 128 && unsigned(chr) <= 15572911) ||
+        (unsigned(chr) >= 15630464 && unsigned(chr) <= 15712189) ||
+        (unsigned(chr) >= 4036001920)
       );
     }
 
     // check if char is within a reduced ascii range
-    // valid in a uri (and also unicode octets)
+    // valid in a uri (copied from Ruby Sass)
     bool is_uri_character(const char& chr)
     {
-      return unsigned(chr) > 41 ||
-             unsigned(chr) == ':' ||
-             unsigned(chr) == '/';
+      return (unsigned(chr) > 41 && unsigned(chr) < 127) ||
+             unsigned(chr) == ':' || unsigned(chr) == '/';
     }
 
     // check if char is within a reduced ascii range

diff --git a/src/parser.cpp b/src/parser.cpp
@@ -316,6 +316,10 @@ namespace Sass {
         else if (String* the_url = parse_url_function_argument()) {
           *args << SASS_MEMORY_NEW(ctx.mem, Argument, the_url->pstate(), the_url);
         }
+        else if (peek < skip_over_scopes < exactly < '(' >, exactly < ')' > > >(position)) {
+          Expression* the_url = parse_list(); // parse_interpolated_chunk(lexed);
+          *args << SASS_MEMORY_NEW(ctx.mem, Argument, the_url->pstate(), the_url);
+        }
         else {
           error("malformed URL", pstate);
         }