vim: src/eval.c comparison

comparison src/eval.c @ 4287:dc3efb6d5a08 v7.3.893

updated for version 7.3.893 Problem: Crash when using b:, w: or t: after closing the buffer, window or tabpage. Solution: Allocate the dictionary instead of having it part of the buffer/window/tabpage struct. (Yukihiro Nakadaira)

author	Bram Moolenaar <bram@vim.org>
date	Mon, 15 Apr 2013 12:27:36 +0200
parents	23ce9a61bdc2
children	11007e80829c

comparison

equal deleted inserted replaced

-:afcc61d24129
+:dc3efb6d5a08
 list_buf_vars(first)
 int *first;
 {
 char_u	numbuf[NUMBUFLEN];
-list_hashtable_vars(&curbuf->b_vars.dv_hashtab, (char_u *)"b:",
+list_hashtable_vars(&curbuf->b_vars->dv_hashtab, (char_u *)"b:",
 								 TRUE, first);
 sprintf((char *)numbuf, "%ld", (long)curbuf->b_changedtick);
 list_one_var_a((char_u *)"b:", (char_u *)"changedtick", VAR_NUMBER,
 							       numbuf, first);
 */
 static void
 list_win_vars(first)
 int *first;
 {
-list_hashtable_vars(&curwin->w_vars.dv_hashtab,
+list_hashtable_vars(&curwin->w_vars->dv_hashtab,
 						 (char_u *)"w:", TRUE, first);
 }
 #ifdef FEAT_WINDOWS
 /*
 */
 static void
 list_tab_vars(first)
 int *first;
 {
-list_hashtable_vars(&curtab->tp_vars.dv_hashtab,
+list_hashtable_vars(&curtab->tp_vars->dv_hashtab,
 						 (char_u *)"t:", TRUE, first);
 }
 #endif
 /*
 	    return cat_prefix_varname('g', hi->hi_key);
 	return hi->hi_key;
 }
 /* b: variables */
-ht = &curbuf->b_vars.dv_hashtab;
+ht = &curbuf->b_vars->dv_hashtab;
 if (bdone < ht->ht_used)
 {
 	if (bdone++ == 0)
 	    hi = ht->ht_array;
 	else
 	++bdone;
 	return (char_u *)"b:changedtick";
 }
 /* w: variables */
-ht = &curwin->w_vars.dv_hashtab;
+ht = &curwin->w_vars->dv_hashtab;
 if (wdone < ht->ht_used)
 {
 	if (wdone++ == 0)
 	    hi = ht->ht_array;
 	else
 	return cat_prefix_varname('w', hi->hi_key);
 }
 #ifdef FEAT_WINDOWS
 /* t: variables */
-ht = &curtab->tp_vars.dv_hashtab;
+ht = &curtab->tp_vars->dv_hashtab;
 if (tdone < ht->ht_used)
 {
 	if (tdone++ == 0)
 	    hi = ht->ht_array;
 	else
 for (i = 1; i <= ga_scripts.ga_len; ++i)
 	set_ref_in_ht(&SCRIPT_VARS(i), copyID);
 /* buffer-local variables */
 for (buf = firstbuf; buf != NULL; buf = buf->b_next)
-	set_ref_in_ht(&buf->b_vars.dv_hashtab, copyID);
+	set_ref_in_item(&buf->b_bufvar.di_tv, copyID);
 /* window-local variables */
 FOR_ALL_TAB_WINDOWS(tp, wp)
-	set_ref_in_ht(&wp->w_vars.dv_hashtab, copyID);
+	set_ref_in_item(&wp->w_winvar.di_tv, copyID);
 #ifdef FEAT_WINDOWS
 /* tabpage-local variables */
 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
-	set_ref_in_ht(&tp->tp_vars.dv_hashtab, copyID);
+	set_ref_in_item(&tp->tp_winvar.di_tv, copyID);
 #endif
 /* global variables */
 set_ref_in_ht(&globvarht, copyID);
 		/* let getbufvar({nr}, "") return the "b:" dictionary.  The
 		 * scope prefix before the NUL byte is required by
 		 * find_var_in_ht(). */
 		varname = (char_u *)"b:" + 2;
 	    /* look up the variable */
-	    v = find_var_in_ht(&curbuf->b_vars.dv_hashtab, varname, FALSE);
+	    v = find_var_in_ht(&curbuf->b_vars->dv_hashtab, varname, FALSE);
 	    if (v != NULL)
 		copy_tv(&v->di_tv, rettv);
 	}
 	/* restore previous notion of curbuf */
 varname = get_tv_string_chk(&argvars[1]);
 tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
 if (tp != NULL && varname != NULL)
 {
 	/* look up the variable */
-	v = find_var_in_ht(&tp->tp_vars.dv_hashtab, varname, FALSE);
+	v = find_var_in_ht(&tp->tp_vars->dv_hashtab, varname, FALSE);
 	if (v != NULL)
 	    copy_tv(&v->di_tv, rettv);
 	else if (argvars[2].v_type != VAR_UNKNOWN)
 	    copy_tv(&argvars[2], rettv);
 }
 		/* let getwinvar({nr}, "") return the "w:" dictionary.  The
 		 * scope prefix before the NUL byte is required by
 		 * find_var_in_ht(). */
 		varname = (char_u *)"w:" + 2;
 	    /* look up the variable */
-	    v = find_var_in_ht(&win->w_vars.dv_hashtab, varname, FALSE);
+	    v = find_var_in_ht(&win->w_vars->dv_hashtab, varname, FALSE);
 	    if (v != NULL)
 		copy_tv(&v->di_tv, rettv);
 	}
 	/* restore previous notion of curwin */
 rettv->vval.v_string = vim_strsave(buf);
 rettv->v_type = VAR_STRING;
 }
-#ifdef FEAT_MZSCHEME
+#if defined(FEAT_MZSCHEME) || defined(PROTO)
 /*
 * "mzeval()" function
 */
 static void
 f_mzeval(argvars, rettv)
 */
 if (vim_strchr(name + 2, ':') != NULL
 			       || vim_strchr(name + 2, AUTOLOAD_CHAR) != NULL)
 	return NULL;
 if (*name == 'b')				/* buffer variable */
-	return &curbuf->b_vars.dv_hashtab;
+	return &curbuf->b_vars->dv_hashtab;
 if (*name == 'w')				/* window variable */
-	return &curwin->w_vars.dv_hashtab;
+	return &curwin->w_vars->dv_hashtab;
 #ifdef FEAT_WINDOWS
 if (*name == 't')				/* tab page variable */
-	return &curtab->tp_vars.dv_hashtab;
+	return &curtab->tp_vars->dv_hashtab;
 #endif
 if (*name == 'v')				/* v: variable */
 	return &vimvarht;
 if (*name == 'a' && current_funccal != NULL) /* function argument */
 	return &current_funccal->l_avars.dv_hashtab;
 dict_var->di_tv.vval.v_dict = dict;
 dict_var->di_tv.v_type = VAR_DICT;
 dict_var->di_tv.v_lock = VAR_FIXED;
 dict_var->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
 dict_var->di_key[0] = NUL;
+}
+/*
+* Unreference a dictionary initialized by init_var_dict().
+*/
+void
+unref_var_dict(dict)
+dict_T	*dict;
+{
+/* Now the dict needs to be freed if no one else is using it, go back to
+* normal reference counting. */
+dict->dv_refcount -= DO_NOT_FREE_CNT - 1;
+dict_unref(dict);
 }
 /*
 * Clean up a list of internal variables.
 * Frees all allocated variables and the value they contain.

Mercurial > vim

comparison src/eval.c @ 4287:dc3efb6d5a08 v7.3.893