updated for version 7.4.272
Problem: Using just "$" does not cause an error message.
Solution: Check for empty environment variable name. (Christian Brabandt)
diff --git a/src/eval.c b/src/eval.c
index 3e1088a..5085b97 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7798,7 +7798,7 @@
* Get the value of an environment variable.
* "arg" is pointing to the '$'. It is advanced to after the name.
* If the environment variable was not set, silently assume it is empty.
- * Always return OK.
+ * Return FAIL if the name is invalid.
*/
static int
get_env_tv(arg, rettv, evaluate)
@@ -7817,32 +7817,33 @@
len = get_env_len(arg);
if (evaluate)
{
- if (len != 0)
- {
- cc = name[len];
- name[len] = NUL;
- /* first try vim_getenv(), fast for normal environment vars */
- string = vim_getenv(name, &mustfree);
- if (string != NULL && *string != NUL)
- {
- if (!mustfree)
- string = vim_strsave(string);
- }
- else
- {
- if (mustfree)
- vim_free(string);
+ if (len == 0)
+ return FAIL; /* can't be an environment variable */
- /* next try expanding things like $VIM and ${HOME} */
- string = expand_env_save(name - 1);
- if (string != NULL && *string == '$')
- {
- vim_free(string);
- string = NULL;
- }
- }
- name[len] = cc;
+ cc = name[len];
+ name[len] = NUL;
+ /* first try vim_getenv(), fast for normal environment vars */
+ string = vim_getenv(name, &mustfree);
+ if (string != NULL && *string != NUL)
+ {
+ if (!mustfree)
+ string = vim_strsave(string);
}
+ else
+ {
+ if (mustfree)
+ vim_free(string);
+
+ /* next try expanding things like $VIM and ${HOME} */
+ string = expand_env_save(name - 1);
+ if (string != NULL && *string == '$')
+ {
+ vim_free(string);
+ string = NULL;
+ }
+ }
+ name[len] = cc;
+
rettv->v_type = VAR_STRING;
rettv->vval.v_string = string;
}
diff --git a/src/testdir/test_eval.in b/src/testdir/test_eval.in
index 8c3d839..11bc7e8 100644
--- a/src/testdir/test_eval.in
+++ b/src/testdir/test_eval.in
@@ -183,6 +183,13 @@
:" script-local function used in Funcref must exist.
:so test_eval_func.vim
:"
+:" Using $ instead of '$' must give an error
+:try
+: call append($, 'foobar')
+:catch
+:$put =v:exception
+:endtry
+:"
:/^start:/+1,$wq! test.out
:" vim: et ts=4 isk-=\: fmr=???,???
:call getchar()
diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok
index f81927b..313f39e 100644
--- a/src/testdir/test_eval.ok
+++ b/src/testdir/test_eval.ok
Binary files differ
diff --git a/src/version.c b/src/version.c
index 9299257..06b9494 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 272,
+/**/
271,
/**/
270,