Skip to content

Commit a5226f4

Browse files
committed
Fix nullptr access on media query without type
Fixes #3030
1 parent 4c83fdb commit a5226f4

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/parser.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,15 +2247,17 @@ namespace Sass {
22472247
if (lex < kwd_not >()) { media_query->is_negated(true); lex < css_comments >(false); }
22482248
else if (lex < kwd_only >()) { media_query->is_restricted(true); lex < css_comments >(false); }
22492249

2250-
if (lex < identifier_schema >()) media_query->media_type(parse_identifier_schema());
2251-
else if (lex < identifier >()) media_query->media_type(parse_interpolated_chunk(lexed));
2250+
if (lex < identifier_schema >()) media_query->media_type(parse_identifier_schema());
2251+
else if (lex < identifier >()) media_query->media_type(parse_interpolated_chunk(lexed));
22522252
else media_query->append(parse_media_expression());
22532253

22542254
while (lex_css < kwd_and >()) media_query->append(parse_media_expression());
22552255
if (lex < identifier_schema >()) {
22562256
String_Schema* schema = SASS_MEMORY_NEW(String_Schema, pstate);
2257-
schema->append(media_query->media_type());
2258-
schema->append(SASS_MEMORY_NEW(String_Constant, pstate, " "));
2257+
if (media_query->media_type()) {
2258+
schema->append(media_query->media_type());
2259+
schema->append(SASS_MEMORY_NEW(String_Constant, pstate, " "));
2260+
}
22592261
schema->append(parse_identifier_schema());
22602262
media_query->media_type(schema);
22612263
}

0 commit comments

Comments
 (0)