1 To: vim_dev@googlegroups.com
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
11 Problem: Crash when using map(), filter() and remove() on v:. (ZyX)
12 Also for extend(). (Yukihiro Nakadaira)
13 Solution: Mark v: as locked. Also correct locking error messages.
17 *** ../vim-7.3.154/src/eval.c 2011-04-01 16:07:41.000000000 +0200
18 --- src/eval.c 2011-04-11 13:28:34.000000000 +0200
23 init_var_dict(&globvardict, &globvars_var);
24 init_var_dict(&vimvardict, &vimvars_var);
25 + vimvardict.dv_lock = VAR_FIXED;
26 hash_init(&compat_hashtab);
27 hash_init(&func_hashtab);
31 if (argvars[0].v_type == VAR_LIST)
33 if ((l = argvars[0].vval.v_list) != NULL
34 ! && !tv_check_lock(l->lv_lock, (char_u *)"add()")
35 && list_append_tv(l, &argvars[1]) == OK)
36 copy_tv(&argvars[0], rettv);
39 if (argvars[0].v_type == VAR_LIST)
41 if ((l = argvars[0].vval.v_list) != NULL
42 ! && !tv_check_lock(l->lv_lock, (char_u *)_("add() argument"))
43 && list_append_tv(l, &argvars[1]) == OK)
44 copy_tv(&argvars[0], rettv);
52 + char *arg_errmsg = N_("extend() argument");
54 if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
60 l1 = argvars[0].vval.v_list;
61 l2 = argvars[1].vval.v_list;
62 ! if (l1 != NULL && !tv_check_lock(l1->lv_lock, (char_u *)"extend()")
65 if (argvars[2].v_type != VAR_UNKNOWN)
68 l1 = argvars[0].vval.v_list;
69 l2 = argvars[1].vval.v_list;
70 ! if (l1 != NULL && !tv_check_lock(l1->lv_lock, (char_u *)_(arg_errmsg))
73 if (argvars[2].v_type != VAR_UNKNOWN)
77 d1 = argvars[0].vval.v_dict;
78 d2 = argvars[1].vval.v_dict;
79 ! if (d1 != NULL && !tv_check_lock(d1->dv_lock, (char_u *)"extend()")
82 /* Check the third argument. */
85 d1 = argvars[0].vval.v_dict;
86 d2 = argvars[1].vval.v_dict;
87 ! if (d1 != NULL && !tv_check_lock(d1->dv_lock, (char_u *)_(arg_errmsg))
90 /* Check the third argument. */
96 ! char_u *ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
100 if (argvars[0].v_type == VAR_LIST)
102 if ((l = argvars[0].vval.v_list) == NULL
103 ! || (map && tv_check_lock(l->lv_lock, ermsg)))
106 else if (argvars[0].v_type == VAR_DICT)
108 if ((d = argvars[0].vval.v_dict) == NULL
109 ! || (map && tv_check_lock(d->dv_lock, ermsg)))
117 ! char_u *ermsg = (char_u *)(map ? "map()" : "filter()");
118 ! char *arg_errmsg = (map ? N_("map() argument")
119 ! : N_("filter() argument"));
123 if (argvars[0].v_type == VAR_LIST)
125 if ((l = argvars[0].vval.v_list) == NULL
126 ! || tv_check_lock(l->lv_lock, (char_u *)_(arg_errmsg)))
129 else if (argvars[0].v_type == VAR_DICT)
131 if ((d = argvars[0].vval.v_dict) == NULL
132 ! || tv_check_lock(d->dv_lock, (char_u *)_(arg_errmsg)))
141 ! if (tv_check_lock(di->di_tv.v_lock, ermsg))
143 vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
144 if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL
149 ! if (tv_check_lock(di->di_tv.v_lock,
150 ! (char_u *)_(arg_errmsg)))
152 vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
153 if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL
157 for (li = l->lv_first; li != NULL; li = nli)
159 ! if (tv_check_lock(li->li_tv.v_lock, ermsg))
162 vimvars[VV_KEY].vv_nr = idx;
165 for (li = l->lv_first; li != NULL; li = nli)
167 ! if (tv_check_lock(li->li_tv.v_lock, (char_u *)_(arg_errmsg)))
170 vimvars[VV_KEY].vv_nr = idx;
173 if (argvars[0].v_type != VAR_LIST)
174 EMSG2(_(e_listarg), "insert()");
175 else if ((l = argvars[0].vval.v_list) != NULL
176 ! && !tv_check_lock(l->lv_lock, (char_u *)"insert()"))
178 if (argvars[2].v_type != VAR_UNKNOWN)
179 before = get_tv_number_chk(&argvars[2], &error);
181 if (argvars[0].v_type != VAR_LIST)
182 EMSG2(_(e_listarg), "insert()");
183 else if ((l = argvars[0].vval.v_list) != NULL
184 ! && !tv_check_lock(l->lv_lock, (char_u *)_("insert() argument")))
186 if (argvars[2].v_type != VAR_UNKNOWN)
187 before = get_tv_number_chk(&argvars[2], &error);
194 if (argvars[0].v_type == VAR_DICT)
196 if (argvars[2].v_type != VAR_UNKNOWN)
197 EMSG2(_(e_toomanyarg), "remove()");
198 else if ((d = argvars[0].vval.v_dict) != NULL
199 ! && !tv_check_lock(d->dv_lock, (char_u *)"remove() argument"))
201 key = get_tv_string_chk(&argvars[1]);
207 + char *arg_errmsg = N_("remove() argument");
209 if (argvars[0].v_type == VAR_DICT)
211 if (argvars[2].v_type != VAR_UNKNOWN)
212 EMSG2(_(e_toomanyarg), "remove()");
213 else if ((d = argvars[0].vval.v_dict) != NULL
214 ! && !tv_check_lock(d->dv_lock, (char_u *)_(arg_errmsg)))
216 key = get_tv_string_chk(&argvars[1]);
220 else if (argvars[0].v_type != VAR_LIST)
221 EMSG2(_(e_listdictarg), "remove()");
222 else if ((l = argvars[0].vval.v_list) != NULL
223 ! && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument"))
228 else if (argvars[0].v_type != VAR_LIST)
229 EMSG2(_(e_listdictarg), "remove()");
230 else if ((l = argvars[0].vval.v_list) != NULL
231 ! && !tv_check_lock(l->lv_lock, (char_u *)_(arg_errmsg)))
237 if (argvars[0].v_type != VAR_LIST)
238 EMSG2(_(e_listarg), "reverse()");
239 else if ((l = argvars[0].vval.v_list) != NULL
240 ! && !tv_check_lock(l->lv_lock, (char_u *)"reverse()"))
243 l->lv_first = l->lv_last = NULL;
245 if (argvars[0].v_type != VAR_LIST)
246 EMSG2(_(e_listarg), "reverse()");
247 else if ((l = argvars[0].vval.v_list) != NULL
248 ! && !tv_check_lock(l->lv_lock, (char_u *)_("reverse() argument")))
251 l->lv_first = l->lv_last = NULL;
256 l = argvars[0].vval.v_list;
257 ! if (l == NULL || tv_check_lock(l->lv_lock, (char_u *)"sort()"))
259 rettv->vval.v_list = l;
260 rettv->v_type = VAR_LIST;
264 l = argvars[0].vval.v_list;
265 ! if (l == NULL || tv_check_lock(l->lv_lock,
266 ! (char_u *)_("sort() argument")))
268 rettv->vval.v_list = l;
269 rettv->v_type = VAR_LIST;
270 *** ../vim-7.3.154/src/version.c 2011-04-02 15:12:45.000000000 +0200
271 --- src/version.c 2011-04-11 13:13:38.000000000 +0200
275 { /* Add new patch number below this line */
281 I used to be indecisive, now I'm not sure.
283 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
284 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
285 \\\ an exciting new programming language -- http://www.Zimbu.org ///
286 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///