PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

First compute cmd_list length before passing it 

In switcher_run(), first compute the cmd_list and in particular its
length before passing it to menu().

In C the evaluation order of parameters to a function call is
unspecified, see e.g. http://en.cppreference.com/w/c/language/eval_order
for some background. So it might happen (and indeed did happen on my
machine) that cmd_list_length (of value 0) is pushed to the stack before
sw->get_data() sets the variable to the actual length.
This commit is contained in:
Thorsten Wißmann 2015-09-04 13:00:17 +02:00
parent bcd0ed8674
commit 8f0bf673ce
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/rofi.c
View File

@ -2115,8 +2115,12 @@ SwitcherMode switcher_run ( char **input, Switcher *sw )
char *prompt = g_strdup_printf ( "%s:", sw->name );
int selected_line = -1;
unsigned int cmd_list_length = 0;
char **cmd_list = NULL;
int mretv = menu ( sw->get_data ( &cmd_list_length, sw ), cmd_list_length, // List data.
// get the list and get its length, before passing the length to menu
cmd_list = sw->get_data ( &cmd_list_length, sw );
int mretv = menu ( cmd_list, cmd_list_length, // List data.
input, prompt, // Input and prompt
sw->token_match, sw, // token match + arg.
&selected_line, // Selected line.