aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1289: crash when using a custom completion function

Browse Source 
Problem:    Crash when using a custom completion function.
Solution:   Initialize all of the expand_T. (closes #6532)
This commit is contained in:
Bram Moolenaar 2020-07-25 14:11:55 +02:00
parent 13e12b8a3c
commit c841afff6a
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmdexpand.c
View File

@ -494,18 +494,9 @@ ExpandOne(
void void
ExpandInit(expand_T *xp) ExpandInit(expand_T *xp)
{ {
xp->xp_pattern = NULL; CLEAR_POINTER(xp);
xp->xp_pattern_len = 0;
xp->xp_backslash = XP_BS_NONE; xp->xp_backslash = XP_BS_NONE;
#ifndef BACKSLASH_IN_FILENAME
xp->xp_shell = FALSE;
#endif
xp->xp_numfiles = -1; xp->xp_numfiles = -1;
xp->xp_files = NULL;
#if defined(FEAT_EVAL)
xp->xp_arg = NULL;
#endif
xp->xp_line = NULL;
} }
/* /*
@ -2425,7 +2416,7 @@ expand_shellcmd(
# if defined(FEAT_EVAL) # if defined(FEAT_EVAL)
/* /*
* Call "user_expand_func()" to invoke a user defined Vim script function and * Call "user_expand_func()" to invoke a user defined Vim script function and
* return the result (either a string or a List). * return the result (either a string, a List or NULL).
*/ */
static void * static void *
call_user_expand_func( call_user_expand_func(

2
src/version.c
View File

@ -754,6 +754,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 */
/**/
1289,
/**/ /**/
1288, 1288,
/**/ /**/