aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-06 21:53:38 -04:00
Code

patch 8.2.3513: using freed memory when using a timer and searching

Browse Source 
Problem:    Using freed memory when using a timer and searching. (Dominique
            Pellé)
Solution:   Allocated mr_pattern.
This commit is contained in:
Bram Moolenaar 2021-10-15 12:51:29 +01:00
parent accf4ed352
commit a2cff1dbc9
2 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/search.c
View File

@ -84,15 +84,14 @@ static int lastc_bytelen = 1; // >1 for multi-byte char
// copy of spats[], for keeping the search patterns while executing autocmds // copy of spats[], for keeping the search patterns while executing autocmds
static spat_T saved_spats[2]; static spat_T saved_spats[2];
static char_u *saved_mr_pattern = NULL;
# ifdef FEAT_SEARCH_EXTRA # ifdef FEAT_SEARCH_EXTRA
static int saved_spats_last_idx = 0; static int saved_spats_last_idx = 0;
static int saved_spats_no_hlsearch = 0; static int saved_spats_no_hlsearch = 0;
# endif # endif
static char_u *mr_pattern = NULL; // pattern used by search_regcomp() // allocated copy of pattern used by search_regcomp()
#ifdef FEAT_RIGHTLEFT static char_u *mr_pattern = NULL;
static int mr_pattern_alloced = FALSE; // mr_pattern was allocated
#endif
#ifdef FEAT_FIND_ID #ifdef FEAT_FIND_ID
/* /*
@ -161,29 +160,13 @@ search_regcomp(
else if (options & SEARCH_HIS) // put new pattern in history else if (options & SEARCH_HIS) // put new pattern in history
add_to_history(HIST_SEARCH, pat, TRUE, NUL); add_to_history(HIST_SEARCH, pat, TRUE, NUL);
vim_free(mr_pattern);
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
if (mr_pattern_alloced)
{
vim_free(mr_pattern);
mr_pattern_alloced = FALSE;
}
if (curwin->w_p_rl && *curwin->w_p_rlc == 's') if (curwin->w_p_rl && *curwin->w_p_rlc == 's')
{ mr_pattern = reverse_text(pat);
char_u *rev_pattern;
rev_pattern = reverse_text(pat);
if (rev_pattern == NULL)
mr_pattern = pat; // out of memory, keep normal pattern.
else
{
mr_pattern = rev_pattern;
mr_pattern_alloced = TRUE;
}
}
else else
#endif #endif
mr_pattern = pat; mr_pattern = vim_strsave(pat);
/* /*
* Save the currently used pattern in the appropriate place, * Save the currently used pattern in the appropriate place,
@ -294,6 +277,10 @@ save_search_patterns(void)
saved_spats[1] = spats[1]; saved_spats[1] = spats[1];
if (spats[1].pat != NULL) if (spats[1].pat != NULL)
saved_spats[1].pat = vim_strsave(spats[1].pat); saved_spats[1].pat = vim_strsave(spats[1].pat);
if (mr_pattern == NULL)
saved_mr_pattern = NULL;
else
saved_mr_pattern = vim_strsave(mr_pattern);
#ifdef FEAT_SEARCH_EXTRA #ifdef FEAT_SEARCH_EXTRA
saved_spats_last_idx = last_idx; saved_spats_last_idx = last_idx;
saved_spats_no_hlsearch = no_hlsearch; saved_spats_no_hlsearch = no_hlsearch;
@ -313,6 +300,8 @@ restore_search_patterns(void)
#endif #endif
vim_free(spats[1].pat); vim_free(spats[1].pat);
spats[1] = saved_spats[1]; spats[1] = saved_spats[1];
vim_free(mr_pattern);
mr_pattern = saved_mr_pattern;
#ifdef FEAT_SEARCH_EXTRA #ifdef FEAT_SEARCH_EXTRA
last_idx = saved_spats_last_idx; last_idx = saved_spats_last_idx;
set_no_hlsearch(saved_spats_no_hlsearch); set_no_hlsearch(saved_spats_no_hlsearch);
@ -326,15 +315,7 @@ free_search_patterns(void)
{ {
vim_free(spats[0].pat); vim_free(spats[0].pat);
vim_free(spats[1].pat); vim_free(spats[1].pat);
VIM_CLEAR(mr_pattern);
# ifdef FEAT_RIGHTLEFT
if (mr_pattern_alloced)
{
vim_free(mr_pattern);
mr_pattern_alloced = FALSE;
mr_pattern = NULL;
}
# endif
} }
#endif #endif

2
src/version.c
View File

@ -757,6 +757,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 */
/**/
3513,
/**/ /**/
3512, 3512,
/**/ /**/