vim: src/eval.c comparison

comparison src/eval.c @ 2739:2bd574a2ef1c v7.3.146

updated for version 7.3.146 Problem: It's possible to assign to a read-only member of a dict. It's possible to create a global variable "0". (ZyX) It's possible to add a v: variable with ":let v:.name = 1". Solution: Add check for dict item being read-only. Check the name of g: variables. Disallow adding v: variables.

author	Bram Moolenaar <bram@vim.org>
date	Sun, 27 Mar 2011 16:03:15 +0200
parents	3ea3dcbf2cd6
children	6146c9859f65

comparison

equal deleted inserted replaced

-:01b806a03556
+:2bd574a2ef1c
 static void list_one_var __ARGS((dictitem_T *v, char_u *prefix, int *first));
 static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string, int *first));
 static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
 static int var_check_ro __ARGS((int flags, char_u *name));
 static int var_check_fixed __ARGS((int flags, char_u *name));
+static int var_check_func_name __ARGS((char_u *name, int new_var));
+static int valid_varname __ARGS((char_u *varname));
 static int tv_check_lock __ARGS((int lock, char_u *name));
 static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID));
 static char_u *find_option_end __ARGS((char_u **arg, int *opt_flags));
 static char_u *trans_function_name __ARGS((char_u **pp, int skip, int flags, funcdict_T *fd));
 static int eval_fname_script __ARGS((char_u *p));
 		}
 	    }
 	    lp->ll_list = NULL;
 	    lp->ll_dict = lp->ll_tv->vval.v_dict;
 	    lp->ll_di = dict_find(lp->ll_dict, key, len);
+	    /* When assigning to g: check that a function and variable name is
+	     * valid. */
+	    if (rettv != NULL && lp->ll_dict == &globvardict)
+	    {
+		if (rettv->v_type == VAR_FUNC
+			       && var_check_func_name(key, lp->ll_di == NULL))
+		    return NULL;
+		if (!valid_varname(key))
+		    return NULL;
+	    }
 	    if (lp->ll_di == NULL)
 	    {
+		/* Can't add "v:" variable. */
+		if (lp->ll_dict == &vimvardict)
+		{
+		    EMSG2(_(e_illvar), name);
+		    return NULL;
+		}
 		/* Key does not exist in dict: may need to add it. */
 		if (*p == '[' || *p == '.' || unlet)
 		{
 		    if (!quiet)
 			EMSG2(_(e_dictkey), key);
 		    clear_tv(&var1);
 		if (lp->ll_newkey == NULL)
 		    p = NULL;
 		break;
 	    }
+	    /* existing variable, need to check if it can be changed */
+	    else if (var_check_ro(lp->ll_di->di_flags, name))
+		return NULL;
 	    if (len == -1)
 		clear_tv(&var1);
 	    lp->ll_tv = &lp->ll_di->di_tv;
 	}
 	else
 int		copy;	    /* make copy of value in "tv" */
 {
 dictitem_T	*v;
 char_u	*varname;
 hashtab_T	*ht;
-char_u	*p;
 ht = find_var_ht(name, &varname);
 if (ht == NULL || *varname == NUL)
 {
 	EMSG2(_(e_illvar), name);
 	return;
 }
 v = find_var_in_ht(ht, varname, TRUE);
-if (tv->v_type == VAR_FUNC)
+if (tv->v_type == VAR_FUNC && var_check_func_name(name, v == NULL))
-{
+	return;
-	if (!(vim_strchr((char_u *)"wbs", name[0]) != NULL && name[1] == ':')
-		&& !ASCII_ISUPPER((name[0] != NUL && name[1] == ':')
-							 ? name[2] : name[0]))
-	{
-	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
-	    return;
-	}
-	/* Don't allow hiding a function.  When "v" is not NULL we might be
-	 * assigning another function to the same var, the type is checked
-	 * below. */
-	if (v == NULL && function_exists(name))
-	{
-	    EMSG2(_("E705: Variable name conflicts with existing function: %s"),
-									name);
-	    return;
-	}
-}
 if (v != NULL)
 {
 	/* existing variable, need to clear the value */
 	if (var_check_ro(v->di_flags, name)
 	    EMSG2(_(e_illvar), name);
 	    return;
 	}
 	/* Make sure the variable name is valid. */
-	for (p = varname; *p != NUL; ++p)
+	if (!valid_varname(varname))
-	    if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
+	    return;
-						       && *p != AUTOLOAD_CHAR)
-	    {
-		EMSG2(_(e_illvar), varname);
-		return;
-	    }
 	v = (dictitem_T *)alloc((unsigned)(sizeof(dictitem_T)
 							  + STRLEN(varname)));
 	if (v == NULL)
 	    return;
 {
 	EMSG2(_("E795: Cannot delete variable %s"), name);
 	return TRUE;
 }
 return FALSE;
+}
+/*
+* Check if a funcref is assigned to a valid variable name.
+* Return TRUE and give an error if not.
+*/
+static int
+var_check_func_name(name, new_var)
+char_u *name;    /* points to start of variable name */
+int    new_var;  /* TRUE when creating the variable */
+{
+if (!(vim_strchr((char_u *)"wbs", name[0]) != NULL && name[1] == ':')
+	    && !ASCII_ISUPPER((name[0] != NUL && name[1] == ':')
+						     ? name[2] : name[0]))
+{
+	EMSG2(_("E704: Funcref variable name must start with a capital: %s"),
+									name);
+	return TRUE;
+}
+/* Don't allow hiding a function.  When "v" is not NULL we might be
+* assigning another function to the same var, the type is checked
+* below. */
+if (new_var && function_exists(name))
+{
+	EMSG2(_("E705: Variable name conflicts with existing function: %s"),
+								    name);
+	return TRUE;
+}
+return FALSE;
+}
+/*
+* Check if a variable name is valid.
+* Return FALSE and give an error if not.
+*/
+static int
+valid_varname(varname)
+char_u *varname;
+{
+char_u *p;
+for (p = varname; *p != NUL; ++p)
+	if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
+						   && *p != AUTOLOAD_CHAR)
+	{
+	    EMSG2(_(e_illvar), varname);
+	    return FALSE;
+	}
+return TRUE;
 }
 /*
 * Return TRUE if typeval "tv" is set to be locked (immutable).
 * Also give an error message, using "name".

Mercurial > vim

comparison src/eval.c @ 2739:2bd574a2ef1c v7.3.146