Fix potential memory leaks

mgreter · mgreter · commit ef8b33e67533 · 2021-05-26T22:15:10.000+02:00
diff --git a/src/eval.cpp b/src/eval.cpp
@@ -1114,7 +1114,9 @@ namespace Sass {
 
     ValueObj rv = condition ? condition->accept(this) : nullptr;
     Expression* ex = rv && rv->isTruthy() ? ifTrue : ifFalse;
-    return ex ? withoutSlash(ex->accept(this)) : nullptr;
+    if (ex == nullptr) return nullptr;
+    ValueObj result(ex->accept(this));
+    return withoutSlash(result);
   }
 
   Value* Eval::visitParenthesizedExpression(ParenthesizedExpression* ex)
@@ -2324,8 +2326,8 @@ namespace Sass {
 
   Value* Eval::visitReturnRule(ReturnRule* rule)
   {
-    return withoutSlash(
-      rule->value()->accept(this));
+    ValueObj result(rule->value()->accept(this));
+    return withoutSlash(result);
   }
 
   Value* Eval::visitSilentComment(SilentComment* c)

Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,9 @@ namespace Sass {`
`1114`	`1114`
`1115`	`1115`	`ValueObj rv = condition ? condition->accept(this) : nullptr;`
`1116`	`1116`	`Expression* ex = rv && rv->isTruthy() ? ifTrue : ifFalse;`
`1117`		`- return ex ? withoutSlash(ex->accept(this)) : nullptr;`
	`1117`	`+ if (ex == nullptr) return nullptr;`
	`1118`	`+ ValueObj result(ex->accept(this));`
	`1119`	`+ return withoutSlash(result);`
`1118`	`1120`	`}`
`1119`	`1121`
`1120`	`1122`	`Value* Eval::visitParenthesizedExpression(ParenthesizedExpression* ex)`
`@@ -2324,8 +2326,8 @@ namespace Sass {`
`2324`	`2326`
`2325`	`2327`	`Value* Eval::visitReturnRule(ReturnRule* rule)`
`2326`	`2328`	`{`
`2327`		`- return withoutSlash(`
`2328`		`- rule->value()->accept(this));`
	`2329`	`+ ValueObj result(rule->value()->accept(this));`
	`2330`	`+ return withoutSlash(result);`
`2329`	`2331`	`}`
`2330`	`2332`
`2331`	`2333`	`Value* Eval::visitSilentComment(SilentComment* c)`