Skip to content

Commit 6ded0d0

Browse files
authored
Merge pull request #2218 from mgreter/bugfix/issue-1452
Error when stringifying empty lists for function calls
2 parents 57cb27a + 6c6f951 commit 6ded0d0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/eval.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,11 @@ namespace Sass {
797797
Env* env = environment();
798798
if (!env->has(full_name)) {
799799
if (!env->has("*[f]")) {
800+
for (Argument* arg : args->elements()) {
801+
if (List* ls = dynamic_cast<List*>(arg->value())) {
802+
if (ls->size() == 0) error("() isn't a valid CSS value.", c->pstate());
803+
}
804+
}
800805
args = static_cast<Arguments*>(args->perform(this));
801806
Function_Call* lit = SASS_MEMORY_NEW(ctx.mem, Function_Call,
802807
c->pstate(),

src/extend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1971,7 +1971,7 @@ namespace Sass {
19711971
Wrapped_Selector* cpy_ws = SASS_MEMORY_NEW(ctx.mem, Wrapped_Selector, *ws);
19721972
CommaSequence_Selector* cpy_ws_sl = SASS_MEMORY_NEW(ctx.mem, CommaSequence_Selector, sl->pstate());
19731973
// remove parent selectors from inner selector
1974-
if (ext_cs->first()) {
1974+
if (ext_cs->first() && ext_cs->first()->head()->length() > 0) {
19751975
Wrapped_Selector* ext_ws = dynamic_cast<Wrapped_Selector*>(ext_cs->first()->head()->first());
19761976
if (ext_ws/* && ext_cs->length() == 1*/) {
19771977
CommaSequence_Selector* ws_cs = dynamic_cast<CommaSequence_Selector*>(ext_ws->selector());

0 commit comments

Comments
 (0)