clang/"null pointer dereference" #10755

This commit is contained in:
Ihor Antonov 2019-08-13 14:52:25 -04:00 committed by Justin M. Keyes
parent 5e1acd412b
commit 947bd293c9

View File

@ -3672,13 +3672,11 @@ static buf_T *ins_compl_next_buf(buf_T *buf, int flag)
} }
/* // Execute user defined complete function 'completefunc' or 'omnifunc', and
* Execute user defined complete function 'completefunc' or 'omnifunc', and // get matches in "matches".
* get matches in "matches".
*/
static void static void
expand_by_function ( expand_by_function(
int type, /* CTRL_X_OMNI or CTRL_X_FUNCTION */ int type, // CTRL_X_OMNI or CTRL_X_FUNCTION
char_u *base char_u *base
) )
{ {
@ -3691,9 +3689,11 @@ expand_by_function (
typval_T rettv; typval_T rettv;
const int save_State = State; const int save_State = State;
assert(curbuf != NULL);
funcname = (type == CTRL_X_FUNCTION) ? curbuf->b_p_cfu : curbuf->b_p_ofu; funcname = (type == CTRL_X_FUNCTION) ? curbuf->b_p_cfu : curbuf->b_p_ofu;
if (*funcname == NUL) if (*funcname == NUL) {
return; return;
}
// Call 'completefunc' to obtain the list of matches. // Call 'completefunc' to obtain the list of matches.
typval_T args[3]; typval_T args[3];