diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-07-25 16:47:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-07-25 16:47:03 +0200 |
| commit | 0cbba94b7e2575ba311d4eab316cc5528ffd5b67 (patch) | |
| tree | d046867458eb407111993eb8a92648c726dbfccf /src/eval.c | |
| parent | 9bdb9a0987d45d74322b7403fe2203cfee983493 (diff) | |
| download | vim-0cbba94b7e2575ba311d4eab316cc5528ffd5b67.zip | |
updated for version 7.3.614
Problem: Number argument gets turned into a number while it should be a
string.
Solution: Add flag to the call_vim_function() call. (Yasuhiro Matsumoto)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/eval.c b/src/eval.c index b83334c36..b04f33034 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1564,11 +1564,12 @@ eval_expr(arg, nextcmd) * Returns OK or FAIL. */ int -call_vim_function(func, argc, argv, safe, rettv) +call_vim_function(func, argc, argv, safe, str_arg_only, rettv) char_u *func; int argc; char_u **argv; int safe; /* use the sandbox */ + int str_arg_only; /* all arguments are strings */ typval_T *rettv; { typval_T *argvars; @@ -1593,8 +1594,11 @@ call_vim_function(func, argc, argv, safe, rettv) continue; } - /* Recognize a number argument, the others must be strings. */ - vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL); + if (str_arg_only) + len = 0; + else + /* Recognize a number argument, the others must be strings. */ + vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL); if (len != 0 && len == (int)STRLEN(argv[i])) { argvars[i].v_type = VAR_NUMBER; @@ -1646,7 +1650,8 @@ call_func_retstr(func, argc, argv, safe) typval_T rettv; char_u *retval; - if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL) + /* All arguments are passed as strings, no conversion to number. */ + if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL) return NULL; retval = vim_strsave(get_tv_string(&rettv)); @@ -1671,7 +1676,8 @@ call_func_retnr(func, argc, argv, safe) typval_T rettv; long retval; - if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL) + /* All arguments are passed as strings, no conversion to number. */ + if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL) return -1; retval = get_tv_number_chk(&rettv, NULL); @@ -1694,7 +1700,8 @@ call_func_retlist(func, argc, argv, safe) { typval_T rettv; - if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL) + /* All arguments are passed as strings, no conversion to number. */ + if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL) return NULL; if (rettv.v_type != VAR_LIST) |