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

patch 7.4.2220

Browse Source 
Problem:    printf() gives an error when the argument for %s is not a string.
            (Ozaki Kiichi)
Solution:   Behave like invoking string() on the argument. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2016-08-16 21:30:54 +02:00
parent f5a39447a8
commit e5a8f35b42
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/message.c
View File

@@ -3887,7 +3887,7 @@ do_browse(
static char *e_printf = N_("E766: Insufficient arguments for printf()");
static varnumber_T tv_nr(typval_T *tvs, int *idxp);
static char *tv_str(typval_T *tvs, int *idxp);
static char *tv_str(typval_T *tvs, int *idxp, char_u **tofree);
# ifdef FEAT_FLOAT
static double tv_float(typval_T *tvs, int *idxp);
# endif
@@ -3916,20 +3916,28 @@ tv_nr(typval_T *tvs, int *idxp)
/*
* Get string argument from "idxp" entry in "tvs". First entry is 1.
* If "tofree" is NULL get_tv_string_chk() is used. Some types (e.g. List)
* are not converted to a string.
* If "tofree" is not NULL echo_string() is used. All types are converted to
* a string with the same format as ":echo". The caller must free "*tofree".
* Returns NULL for an error.
*/
static char *
tv_str(typval_T *tvs, int *idxp)
tv_str(typval_T *tvs, int *idxp, char_u **tofree)
{
int idx = *idxp - 1;
char *s = NULL;
int idx = *idxp - 1;
char *s = NULL;
static char_u numbuf[NUMBUFLEN];
if (tvs[idx].v_type == VAR_UNKNOWN)
EMSG(_(e_printf));
else
{
++*idxp;
s = (char *)get_tv_string_chk(&tvs[idx]);
if (tofree != NULL)
s = (char *)echo_string(&tvs[idx], tofree, numbuf, get_copyID());
else
s = (char *)get_tv_string_chk(&tvs[idx]);
}
return s;
}
@@ -4113,6 +4121,10 @@ vim_vsnprintf(
/* current conversion specifier character */
char fmt_spec = '\0';
/* buffer for 's' and 'S' specs */
char_u *tofree = NULL;
str_arg = NULL;
p++; /* skip '%' */
@@ -4276,7 +4288,7 @@ vim_vsnprintf(
case 'S':
str_arg =
# if defined(FEAT_EVAL)
tvs != NULL ? tv_str(tvs, &arg_idx) :
tvs != NULL ? tv_str(tvs, &arg_idx, &tofree) :
# endif
va_arg(ap, char *);
if (str_arg == NULL)
@@ -4367,7 +4379,8 @@ vim_vsnprintf(
length_modifier = '\0';
ptr_arg =
# if defined(FEAT_EVAL)
tvs != NULL ? (void *)tv_str(tvs, &arg_idx) :
tvs != NULL ? (void *)tv_str(tvs, &arg_idx,
NULL) :
# endif
va_arg(ap, void *);
if (ptr_arg != NULL)
@@ -4877,6 +4890,7 @@ vim_vsnprintf(
str_l += pn;
}
}
vim_free(tofree);
}
}