|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
To: vim-dev@vim.org
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Subject: Patch 7.0.134
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Fcc: outbox
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Mime-Version: 1.0
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Content-Type: text/plain; charset=ISO-8859-1
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Content-Transfer-Encoding: 8bit
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
------------
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Patch 7.0.134
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Problem: Crash when comparing a recursively looped List or Dictionary.
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Solution: Limit recursiveness for comparing to 1000.
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
Files: src/eval.c
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
*** ../vim-7.0.133/src/eval.c Tue Oct 10 12:56:09 2006
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
--- src/eval.c Sun Oct 15 15:08:13 2006
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
***************
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
*** 5520,5538 ****
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
{
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
char_u buf1[NUMBUFLEN], buf2[NUMBUFLEN];
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
char_u *s1, *s2;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! if (tv1->v_type != tv2->v_type)
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
return FALSE;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
switch (tv1->v_type)
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
{
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
case VAR_LIST:
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! /* recursive! */
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! return list_equal(tv1->vval.v_list, tv2->vval.v_list, ic);
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
case VAR_DICT:
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! /* recursive! */
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! return dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic);
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
case VAR_FUNC:
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
return (tv1->vval.v_string != NULL
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
--- 5520,5546 ----
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
{
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
char_u buf1[NUMBUFLEN], buf2[NUMBUFLEN];
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
char_u *s1, *s2;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
+ static int recursive = 0; /* cach recursive loops */
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
+ int r;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! /* Catch lists and dicts that have an endless loop by limiting
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! * recursiveness to 1000. */
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! if (tv1->v_type != tv2->v_type || recursive >= 1000)
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
return FALSE;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
switch (tv1->v_type)
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
{
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
case VAR_LIST:
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! ++recursive;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! r = list_equal(tv1->vval.v_list, tv2->vval.v_list, ic);
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! --recursive;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! return r;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
case VAR_DICT:
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! ++recursive;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! r = dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic);
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! --recursive;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
! return r;
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
case VAR_FUNC:
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
return (tv1->vval.v_string != NULL
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
*** ../vim-7.0.133/src/version.c Sat Oct 14 14:33:21 2006
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
--- src/version.c Sun Oct 15 15:03:30 2006
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
***************
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
*** 668,669 ****
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
--- 668,671 ----
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
{ /* Add new patch number below this line */
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
+ /**/
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
+ 134,
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
/**/
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
--
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
It was recently discovered that research causes cancer in rats.
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
![](https://seccdn.libravatar.org/avatar/d9c2329ed86b5a3d16b53832d4e0af08aeacef0449836318546ae137799e4323?s=16&d=retro) |
e3acc4e |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|