marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

complete: Don't read outside string 

Sometimes the shell_cur value given to us by bash
is longer than expected, so don't step outside the
string in this case.

Fixes https://github.com/flatpak/flatpak/issues/764
tingping/wmclass
Alexander Larsson 2017-05-19 12:52:39 +02:00
parent 617e3a4e4f
commit 6c5ee01d01
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/flatpak-utils.c
View File

@ -5321,6 +5321,7 @@ flatpak_complete_word (FlatpakCompletion *completion,
va_list args;
const char *rest;
const char *shell_cur;
const char *shell_cur_end;
g_autofree char *string = NULL;
g_return_if_fail (format != NULL);
@ -5337,11 +5338,18 @@ flatpak_complete_word (FlatpakCompletion *completion,
shell_cur = completion->shell_cur ? completion->shell_cur : "";
/* I'm not sure exactly what bash is doing here, but this seems to work... */
if (strcmp (shell_cur, "=") == 0)
rest = string + strlen (completion->cur) - strlen (shell_cur) + 1;
else
rest = string + strlen (completion->cur) - strlen (shell_cur);
rest = string + strlen (completion->cur);
shell_cur_end = shell_cur + strlen(shell_cur);
while (shell_cur_end > shell_cur &&
rest > string &&
shell_cur_end[-1] == rest[-1] &&
/* I'm not sure exactly what bash is doing here with =, but this seems to work... */
shell_cur_end[-1] != '=')
{
rest--;
shell_cur_end--;
}
flatpak_completion_debug ("completing word: '%s' (%s)", string, rest);