From 8d5cfe4ffcb44a924ba370a10c98ba089f018e2e Mon Sep 17 00:00:00 2001 From: Jurica Bradaric Date: Tue, 2 Feb 2016 20:24:30 +0100 Subject: [PATCH] vim-patch:7.4.820 Problem: Invalid memory access in file_pat_to_reg_pat. Solution: Avoid looking before the start of a string. (Dominique Pelle) https://github.com/vim/vim/commit/8fee878fe277ec1b1b833ba6e5db679151f7982f --- src/nvim/fileio.c | 7 ++++--- src/nvim/version.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 355fddfdbb..8fe7ad0e30 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -7160,10 +7160,11 @@ char_u * file_pat_to_reg_pat( else reg_pat[i++] = '^'; endp = pat_end - 1; - if (*endp == '*') { - while (endp - pat > 0 && *endp == '*') + if (endp >= pat && *endp == '*') { + while (endp - pat > 0 && *endp == '*') { endp--; - add_dollar = FALSE; + } + add_dollar = false; } for (p = pat; *p && nested >= 0 && p <= endp; p++) { switch (*p) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 45a96c427b..fc526cc953 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -468,7 +468,7 @@ static int included_patches[] = { 823, // 822, // 821, - // 820, + 820, // 819, // 818, 817,