circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow % strings that are all numbers or %s, and fix a double free. Both 

reported by George Nachman, GitHub issues 1765 and 1766.
pull/1768/head
nicm 2019-05-31 11:34:09 +00:00
parent b26523c26d
commit 82e47403c6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd-parse.y
View File

@ -998,11 +998,15 @@ yylex(void)
if (ch == '%') {
/*
* % is a condition unless it is alone, then it is a
* token.
* % is a condition unless it is all % or all numbers,
* then it is a token.
*/
yylval.token = yylex_get_word('%');
if (strcmp(yylval.token, "%") == 0)
for (cp = yylval.token; *cp != '\0'; cp++) {
if (*cp != '%' && !isdigit((u_char)*cp))
break;
}
if (*cp == '\0')
return (TOKEN);
if (strcmp(yylval.token, "%if") == 0) {
free(yylval.token);

1
control.c
View File

@ -91,7 +91,6 @@ control_callback(struct client *c, int closed, __unused void *data)
case CMD_PARSE_ERROR:
item = cmdq_get_callback(control_error, pr->error);
cmdq_append(c, item);
free(pr->error);
break;
case CMD_PARSE_SUCCESS:
item = cmdq_get_command(pr->cmdlist, NULL, NULL, 0);