Skip to content

Commit

Permalink
Merge pull request #2075 from mgreter/bugfix/issue_2074
Browse files Browse the repository at this point in the history
Fix segfault with calc prefix and underscore vs hyphen
  • Loading branch information
mgreter committed May 6, 2016
2 parents 9a3f4cb + 7700871 commit 3b1e9ff
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/eval.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ namespace Sass {
Backtrace here(backtrace(), c->pstate(), ", in function `" + c->name() + "`");
exp.backtrace_stack.push_back(&here);
// eval the body if user-defined or special, invoke underlying CPP function if native
if (body && !Prelexer::re_special_fun(c->name().c_str())) { result = body->perform(this); }
if (body && !Prelexer::re_special_fun(name.c_str())) { result = body->perform(this); }
else if (func) { result = func(fn_env, *env, ctx, def->signature(), c->pstate(), backtrace()); }
if (!result) error(std::string("Function ") + c->name() + " did not return a value", c->pstate());
exp.backtrace_stack.pop_back();
Expand Down

0 comments on commit 3b1e9ff

Please sign in to comment.