aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.5024: using freed memory with "]d"

Browse Source 
Problem:    Using freed memory with "]d".
Solution:   Copy the pattern before searching.
This commit is contained in:
Bram Moolenaar
2022-05-26 16:32:44 +01:00
parent 338f1fc0ee
commit e2fa213cf5
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/normal.c
View File

@@ -4464,6 +4464,11 @@ nv_brackets(cmdarg_T *cap)
clearop(cap->oap); clearop(cap->oap);
else else
{ {
// Make a copy, if the line was changed it will be freed.
ptr = vim_strnsave(ptr, len);
if (ptr == NULL)
return;
find_pattern_in_path(ptr, 0, len, TRUE, find_pattern_in_path(ptr, 0, len, TRUE,
cap->count0 == 0 ? !isupper(cap->nchar) : FALSE, cap->count0 == 0 ? !isupper(cap->nchar) : FALSE,
((cap->nchar & 0xf) == ('d' & 0xf)) ? FIND_DEFINE : FIND_ANY, ((cap->nchar & 0xf) == ('d' & 0xf)) ? FIND_DEFINE : FIND_ANY,
@@ -4472,6 +4477,7 @@ nv_brackets(cmdarg_T *cap)
islower(cap->nchar) ? ACTION_SHOW : ACTION_GOTO, islower(cap->nchar) ? ACTION_SHOW : ACTION_GOTO,
cap->cmdchar == ']' ? curwin->w_cursor.lnum + 1 : (linenr_T)1, cap->cmdchar == ']' ? curwin->w_cursor.lnum + 1 : (linenr_T)1,
(linenr_T)MAXLNUM); (linenr_T)MAXLNUM);
vim_free(ptr);
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = TRUE;
} }
} }

6
src/testdir/test_tagjump.vim
View File

@@ -1399,6 +1399,12 @@ func Test_define_search()
sil norm o0 sil norm o0
sil! norm  sil! norm 
bwipe! bwipe!
new somefile
call setline(1, ['first line', '', '#define something 0'])
sil norm 0o0
sil! norm ]d
bwipe!
endfunc endfunc
" Test for [*, [/, ]* and ]/ " Test for [*, [/, ]* and ]/

2
src/version.c
View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5024,
/**/ /**/
5023, 5023,
/**/ /**/