Merge pull request #2996 from mgreter/bugfix/2980-fix-unary-expr-eval

Fix evaluation of unary expressions in loops
sass · Oct 4, 2019 · 23cabbe · 23cabbe
2 parents 408a883 + 3d806e6
commit 23cabbe
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/eval.cpp b/src/eval.cpp
@@ -925,12 +925,19 @@ namespace Sass {
       else if (Color* color = Cast<Color>(operand)) {
         // Use the color name if this was eval with one
         if (color->disp().length() > 0) {
-          operand = SASS_MEMORY_NEW(String_Constant, operand->pstate(), color->disp());
-          u->operand(operand);
+          Unary_Expression_Obj cpy = SASS_MEMORY_COPY(u);
+          cpy->operand(SASS_MEMORY_NEW(String_Constant, operand->pstate(), color->disp()));
+          return SASS_MEMORY_NEW(String_Quoted,
+                                 cpy->pstate(),
+                                 cpy->inspect());
         }
       }
       else {
-        u->operand(operand);
+        Unary_Expression_Obj cpy = SASS_MEMORY_COPY(u);
+        cpy->operand(operand);
+        return SASS_MEMORY_NEW(String_Quoted,
+                               cpy->pstate(),
+                               cpy->inspect());
       }
 
       return SASS_MEMORY_NEW(String_Quoted,