The following changes since commit 4008b7fc8e2bff60a4e98de0005e6bc71b1a8641: Merge branch 'zipf-pareto-lock' of https://github.com/aclamk/fio (2021-01-12 10:52:54 -0700) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to e4d9a7bf68d0ffb9fd7ab328a4f0edddc89297be: Merge branch 'fix_keyword_sub' of https://github.com/sitsofe/fio (2021-01-15 20:52:57 -0700) ---------------------------------------------------------------- Jens Axboe (1): Merge branch 'fix_keyword_sub' of https://github.com/sitsofe/fio Sitsofe Wheeler (1): options: fix keyword substitution heap overrun options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- Diff of recent changes: diff --git a/options.c b/options.c index 47b20c24..0b4c48d6 100644 --- a/options.c +++ b/options.c @@ -5115,10 +5115,10 @@ static char *fio_keyword_replace(char *opt) * If there's more in the original string, copy that * in too */ - opt += strlen(kw->word) + olen; + opt += olen + strlen(kw->word); /* keeps final zero thanks to calloc */ if (strlen(opt)) - memcpy(new + olen + len, opt, opt - o_org - 1); + memcpy(new + olen + len, opt, strlen(opt)); /* * replace opt and free the old opt
