Merge pull request #24991 from zeertzjq/vim-9.0.1846

vim-patch:9.0.{1846,1847}
This commit is contained in:
zeertzjq 2023-09-03 10:05:45 +08:00 committed by GitHub
commit 36cb3262b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View File

@ -3136,7 +3136,7 @@ int cmd_exists(const char *const name)
/// "fullcommand" function /// "fullcommand" function
void f_fullcommand(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) void f_fullcommand(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{ {
char *name = argvars[0].vval.v_string; char *name = (char *)tv_get_string(&argvars[0]);
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;

View File

@ -4770,7 +4770,7 @@ int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1)
} }
} }
while (bits > 0) { while (bits > 0 && i < NUMBUFLEN - 1) {
buf2[i++] = ((n >> --bits) & 0x1) ? '1' : '0'; buf2[i++] = ((n >> --bits) & 0x1) ? '1' : '0';
} }

View File

@ -3273,4 +3273,9 @@ func Test_string_reverse()
let &encoding = save_enc let &encoding = save_enc
endfunc endfunc
func Test_fullcommand()
" this used to crash vim
call assert_equal('', fullcommand(10))
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab