From a0c14ef310acac62276b4ee51930d3246b11772e Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sat, 21 Sep 2024 11:23:07 +0200 Subject: [PATCH 1/2] runtime(filetype): tests: Test_filetype_detection() fails Problem: tests: Test_filetype_detection() fails (after 9.1.0738) Solution: Add missing filetype detect patterns for *.SYSx and *.MODx Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 7c19fb60f896f4..9efa11df78568b 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -243,7 +243,7 @@ if has("fname_case") endif au BufNewFile,BufRead *.sysx setf rapid if has("fname_case") - au BufNewFile,BufRead *.sysX,*.Sysx,*.SysX,*.SYSX setf rapid + au BufNewFile,BufRead *.sysX,*.Sysx,*.SysX,*.SYSX,*.SYSx setf rapid endif " Batch file for 4DOS @@ -1506,7 +1506,7 @@ if has("fname_case") endif au BufNewFile,BufRead *.modx setf rapid if has("fname_case") - au BufNewFile,BufRead *.modX,*.Modx,*.ModX,*.MODX setf rapid + au BufNewFile,BufRead *.modX,*.Modx,*.ModX,*.MODX,*.MODx setf rapid endif " Modula-3 (.m3, .i3, .mg, .ig) From a6de28755ec3fcc86d1ed0b744f1b410a8e9702d Mon Sep 17 00:00:00 2001 From: John Marriott Date: Sat, 21 Sep 2024 11:39:02 +0200 Subject: [PATCH 2/2] patch 9.1.0739: [security]: use-after-free in ex_getln.c Problem: [security]: use-after-free in ex_getln.c Solution: free pointer p a bit later (John Marriott) closes: #15712 Signed-off-by: John Marriott Signed-off-by: Christian Brabandt --- src/ex_getln.c | 3 ++- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ex_getln.c b/src/ex_getln.c index 1b3a699a21eab1..b4c7941013436f 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -3330,7 +3330,6 @@ realloc_cmdbuff(int len) // there, thus copy up to the NUL and add a NUL. mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen); ccline.cmdbuff[ccline.cmdlen] = NUL; - vim_free(p); if (ccline.xpc != NULL && ccline.xpc->xp_pattern != NULL @@ -3345,6 +3344,8 @@ realloc_cmdbuff(int len) ccline.xpc->xp_pattern = ccline.cmdbuff + i; } + vim_free(p); + return OK; } diff --git a/src/version.c b/src/version.c index ff2b77f0f1bb5a..f4b75547115804 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 739, /**/ 738, /**/