Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix segfault with delayed division in interpolations #1668

Merged
merged 1 commit into from
Oct 29, 2015
Merged

Fix segfault with delayed division in interpolations #1668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/eval.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,11 @@ namespace Sass {
// if one of the operands is a '/' then make sure it's evaluated
Expression* lhs = b->left()->perform(this);
lhs->is_delayed(false);
while (typeid(*lhs) == typeid(Binary_Expression)) lhs = lhs->perform(this);
while (typeid(*lhs) == typeid(Binary_Expression)) {
Binary_Expression* lhs_ex = static_cast<Binary_Expression*>(lhs);
if (lhs_ex->type() == Sass_OP::DIV && lhs_ex->is_delayed()) break;
lhs = Eval::operator()(lhs_ex);
}

switch (op_type) {
case Sass_OP::AND:
Expand Down Expand Up @@ -917,6 +921,12 @@ namespace Sass {
return evacuate_quotes(interpolation(value));
} else if (dynamic_cast<Binary_Expression*>(s)) {
Expression* ex = s->perform(this);
// avoid recursive calls if same object gets returned
// since we will call interpolate again for the result
if (ex == s) {
To_String to_string(&ctx);
return evacuate_quotes(s->perform(&to_string));
}
return evacuate_quotes(interpolation(ex));
} else if (dynamic_cast<Function_Call*>(s)) {
Expression* ex = s->perform(this);
Expand Down