|
 |
ac136e6 |
To: vim-dev@vim.org
|
|
|
ac136e6 |
Subject: Patch 7.0.025
|
|
|
ac136e6 |
Fcc: outbox
|
|
|
ac136e6 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
ac136e6 |
Mime-Version: 1.0
|
|
|
ac136e6 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
ac136e6 |
Content-Transfer-Encoding: 8bit
|
|
|
ac136e6 |
------------
|
|
|
ac136e6 |
|
|
|
ac136e6 |
Patch 7.0.025
|
|
|
ac136e6 |
Problem: Crash when removing an element of a:000. (Nikolai Weibull)
|
|
|
ac136e6 |
Solution: Mark the a:000 list with VAR_FIXED.
|
|
|
ac136e6 |
Files: src/eval.c
|
|
|
ac136e6 |
|
|
|
ac136e6 |
|
|
|
ac136e6 |
*** ../vim-7.0.024/src/eval.c Thu Jun 22 17:33:49 2006
|
|
|
ac136e6 |
--- src/eval.c Thu Jun 22 17:56:50 2006
|
|
|
ac136e6 |
***************
|
|
|
ac136e6 |
*** 13250,13256 ****
|
|
|
ac136e6 |
if (argvars[2].v_type != VAR_UNKNOWN)
|
|
|
ac136e6 |
EMSG2(_(e_toomanyarg), "remove()");
|
|
|
ac136e6 |
else if ((d = argvars[0].vval.v_dict) != NULL
|
|
|
ac136e6 |
! && !tv_check_lock(d->dv_lock, (char_u *)"remove()"))
|
|
|
ac136e6 |
{
|
|
|
ac136e6 |
key = get_tv_string_chk(&argvars[1]);
|
|
|
ac136e6 |
if (key != NULL)
|
|
|
ac136e6 |
--- 13254,13260 ----
|
|
|
ac136e6 |
if (argvars[2].v_type != VAR_UNKNOWN)
|
|
|
ac136e6 |
EMSG2(_(e_toomanyarg), "remove()");
|
|
|
ac136e6 |
else if ((d = argvars[0].vval.v_dict) != NULL
|
|
|
ac136e6 |
! && !tv_check_lock(d->dv_lock, (char_u *)"remove() argument"))
|
|
|
ac136e6 |
{
|
|
|
ac136e6 |
key = get_tv_string_chk(&argvars[1]);
|
|
|
ac136e6 |
if (key != NULL)
|
|
|
ac136e6 |
***************
|
|
|
ac136e6 |
*** 13270,13276 ****
|
|
|
ac136e6 |
else if (argvars[0].v_type != VAR_LIST)
|
|
|
ac136e6 |
EMSG2(_(e_listdictarg), "remove()");
|
|
|
ac136e6 |
else if ((l = argvars[0].vval.v_list) != NULL
|
|
|
ac136e6 |
! && !tv_check_lock(l->lv_lock, (char_u *)"remove()"))
|
|
|
ac136e6 |
{
|
|
|
ac136e6 |
int error = FALSE;
|
|
|
ac136e6 |
|
|
|
ac136e6 |
--- 13274,13280 ----
|
|
|
ac136e6 |
else if (argvars[0].v_type != VAR_LIST)
|
|
|
ac136e6 |
EMSG2(_(e_listdictarg), "remove()");
|
|
|
ac136e6 |
else if ((l = argvars[0].vval.v_list) != NULL
|
|
|
ac136e6 |
! && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument"))
|
|
|
ac136e6 |
{
|
|
|
ac136e6 |
int error = FALSE;
|
|
|
ac136e6 |
|
|
|
ac136e6 |
***************
|
|
|
ac136e6 |
*** 19693,19698 ****
|
|
|
ac136e6 |
--- 19697,19703 ----
|
|
|
ac136e6 |
v->di_tv.vval.v_list = &fc.l_varlist;
|
|
|
ac136e6 |
vim_memset(&fc.l_varlist, 0, sizeof(list_T));
|
|
|
ac136e6 |
fc.l_varlist.lv_refcount = 99999;
|
|
|
ac136e6 |
+ fc.l_varlist.lv_lock = VAR_FIXED;
|
|
|
ac136e6 |
|
|
|
ac136e6 |
/*
|
|
|
ac136e6 |
* Set a:firstline to "firstline" and a:lastline to "lastline".
|
|
|
ac136e6 |
*** ../vim-7.0.024/src/version.c Thu Jun 22 17:33:49 2006
|
|
|
ac136e6 |
--- src/version.c Thu Jun 22 17:59:17 2006
|
|
|
ac136e6 |
***************
|
|
|
ac136e6 |
*** 668,669 ****
|
|
|
ac136e6 |
--- 668,671 ----
|
|
|
ac136e6 |
{ /* Add new patch number below this line */
|
|
|
ac136e6 |
+ /**/
|
|
|
ac136e6 |
+ 25,
|
|
|
ac136e6 |
/**/
|
|
|
ac136e6 |
|
|
|
ac136e6 |
--
|
|
|
ac136e6 |
BRIDGEKEEPER: What is your favorite colour?
|
|
|
ac136e6 |
GAWAIN: Blue ... No yelloooooww!
|
|
|
ac136e6 |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
ac136e6 |
|
|
|
ac136e6 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
ac136e6 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
ac136e6 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
ac136e6 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|