Merge pull request #728 from xzyfer/fix/concatentating-null

Error when trying to string concatenate with null
sass · Dec 12, 2014 · fbbfc87 · fbbfc87
2 parents 2e745ea + ff32238
commit fbbfc87
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/eval.cpp b/eval.cpp
@@ -982,6 +982,8 @@ namespace Sass {
       case Binary_Expression::DIV: sep = "/"; break;
       default:                         break;
     }
+    if (ltype == Expression::NULL_VAL) error("invalid null operation: \"null plus "+quote(unquote(rstr), '"')+"\".", lhs->path(), lhs->position());
+    if (rtype == Expression::NULL_VAL) error("invalid null operation: \""+quote(unquote(lstr), '"')+" plus null\".", lhs->path(), lhs->position());
     char q = '\0';
     if (lstr[0] == '"' || lstr[0] == '\'') q = lstr[0];
     else if (rstr[0] == '"' || rstr[0] == '\'') q = rstr[0];