File tree 4 files changed +7
-3
lines changed
4 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -380,7 +380,7 @@ namespace Sass {
380
380
381
381
bool Cssize::bubblable (Statement* s)
382
382
{
383
- return Cast<StyleRule>(s) || s ->bubbles ();
383
+ return Cast<StyleRule>(s) || (s && s ->bubbles () );
384
384
}
385
385
386
386
Block* Cssize::flatten (const Block* b)
@@ -479,7 +479,8 @@ namespace Sass {
479
479
children->pstate (),
480
480
children->length (),
481
481
children->is_root ());
482
- bb->append (ss->perform (this ));
482
+ auto evaled = ss->perform (this );
483
+ if (evaled) bb->append (evaled);
483
484
484
485
Block_Obj wrapper_block = SASS_MEMORY_NEW (Block,
485
486
children->pstate (),
Original file line number Diff line number Diff line change @@ -147,6 +147,7 @@ namespace Sass {
147
147
for (auto target : extensions) {
148
148
SimpleSelector* key = target.first ;
149
149
ExtSelExtMapEntry& val = target.second ;
150
+ if (val.empty ()) continue ;
150
151
if (originals.find (key) == originals.end ()) {
151
152
const Extension& extension = val.front ().second ;
152
153
if (extension.isOptional ) continue ;
Original file line number Diff line number Diff line change @@ -55,7 +55,9 @@ namespace Sass {
55
55
std::vector<void *> arenas;
56
56
57
57
// One pointer for every bucket (zero init)
58
+ #ifdef _MSC_VER
58
59
#pragma warning (suppress:4351)
60
+ #endif
59
61
void * freeList[SassAllocatorBuckets]{};
60
62
61
63
// Increase the address until it sits on a
Original file line number Diff line number Diff line change @@ -289,7 +289,7 @@ namespace Sass {
289
289
290
290
for (size_t i = 0 , L = b->length (); i < L; ++i) {
291
291
Statement_Obj stm = b->get (i);
292
- stm->perform (this );
292
+ if (stm) stm->perform (this );
293
293
if (i < L - 1 && format) append_special_linefeed ();
294
294
}
295
295
You can’t perform that action at this time.
0 commit comments