PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-07-31 21:59:25 -04:00
Code Releases Activity

[Lexer] Fix parsing string in dict not to match " in middle of string.

Browse source 
Fixes: 1205
This commit is contained in:
Dave Davenport 2020-10-02 19:15:19 +02:00
parent b4bbce4af5
commit 7c9a01ffc7
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lexer/theme-lexer.l
View file

@ -155,6 +155,7 @@ static double rofi_theme_parse_convert_hex ( char high, char low)
ASC [\x00-\x7f] ASC [\x00-\x7f]
ASCN [\x00-\t\v-\x7f] ASCN [\x00-\t\v-\x7f]
ASCNP [\x00-\t\v-\x21\x23-\x7f]
U [\x80-\xbf] U [\x80-\xbf]
U2 [\xc2-\xdf] U2 [\xc2-\xdf]
U3 [\xe0-\xef] U3 [\xe0-\xef]
@ -164,12 +165,15 @@ U4 [\xf0-\xf4]
UANYN {ASCN}|{U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} UANYN {ASCN}|{U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
// UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} // UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
UANYNP {ASCNP}|{U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
WHITESPACE [[:blank:]] WHITESPACE [[:blank:]]
WSO [[:blank:]]* WSO [[:blank:]]*
WORD [[:alnum:]-]+ WORD [[:alnum:]-]+
MEDIA_NAME [[:alpha:]-]+ MEDIA_NAME [[:alpha:]-]+
COLOR_NAME [[:alpha:]]+ COLOR_NAME [[:alpha:]]+
STRING \"{UANYN}*\" STRING \"{UANYN}*\"
STRING_LIST \"{UANYNP}*\"
CHAR \'({ASCN}|\\\\|\\\'|\\0)\' CHAR \'({ASCN}|\\\\|\\\'|\\0)\'
HEX [[:xdigit:]] HEX [[:xdigit:]]
NUMBER [[:digit:]] NUMBER [[:digit:]]
@ -709,7 +713,7 @@ if ( queue == NULL ){
yylval->sval = g_strdup(yytext); yylval->sval = g_strdup(yytext);
return T_ELEMENT; return T_ELEMENT;
} }
<PROPERTIES_LIST>{STRING} { <PROPERTIES_LIST>{STRING_LIST} {
yytext[yyleng-1] = '\0'; yytext[yyleng-1] = '\0';
yylval->sval = g_strdup(yytext+1); yylval->sval = g_strdup(yytext+1);
return T_ELEMENT; return T_ELEMENT;