|
 |
ade671e |
To: vim-dev@vim.org
|
|
|
ade671e |
Subject: Patch 7.2.324
|
|
|
ade671e |
Fcc: outbox
|
|
|
ade671e |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
ade671e |
Mime-Version: 1.0
|
|
|
ade671e |
Content-Type: text/plain; charset=UTF-8
|
|
|
ade671e |
Content-Transfer-Encoding: 8bit
|
|
|
ade671e |
------------
|
|
|
ade671e |
|
|
|
ade671e |
Patch 7.2.324
|
|
|
ade671e |
Problem: A negative column argument in setpos() may cause a crash.
|
|
|
ade671e |
Solution: Check for invalid column number. (James Vega)
|
|
|
ade671e |
Files: src/eval.c, src/misc2.c
|
|
|
ade671e |
|
|
|
ade671e |
|
|
|
ade671e |
*** ../vim-7.2.323/src/eval.c 2009-12-24 15:00:31.000000000 +0100
|
|
|
ade671e |
--- src/eval.c 2009-12-31 13:09:19.000000000 +0100
|
|
|
ade671e |
***************
|
|
|
ade671e |
*** 15542,15548 ****
|
|
|
ade671e |
{
|
|
|
ade671e |
if (list2fpos(&argvars[1], &pos, &fnum) == OK)
|
|
|
ade671e |
{
|
|
|
ade671e |
! --pos.col;
|
|
|
ade671e |
if (name[0] == '.' && name[1] == NUL)
|
|
|
ade671e |
{
|
|
|
ade671e |
/* set cursor */
|
|
|
ade671e |
--- 15542,15549 ----
|
|
|
ade671e |
{
|
|
|
ade671e |
if (list2fpos(&argvars[1], &pos, &fnum) == OK)
|
|
|
ade671e |
{
|
|
|
ade671e |
! if (--pos.col < 0)
|
|
|
ade671e |
! pos.col = 0;
|
|
|
ade671e |
if (name[0] == '.' && name[1] == NUL)
|
|
|
ade671e |
{
|
|
|
ade671e |
/* set cursor */
|
|
|
ade671e |
*** ../vim-7.2.323/src/misc2.c 2009-11-25 17:15:16.000000000 +0100
|
|
|
ade671e |
--- src/misc2.c 2009-12-31 13:12:36.000000000 +0100
|
|
|
ade671e |
***************
|
|
|
ade671e |
*** 528,533 ****
|
|
|
ade671e |
--- 528,535 ----
|
|
|
ade671e |
#endif
|
|
|
ade671e |
}
|
|
|
ade671e |
}
|
|
|
ade671e |
+ else if (curwin->w_cursor.col < 0)
|
|
|
ade671e |
+ curwin->w_cursor.col = 0;
|
|
|
ade671e |
|
|
|
ade671e |
#ifdef FEAT_VIRTUALEDIT
|
|
|
ade671e |
/* If virtual editing is on, we can leave the cursor on the old position,
|
|
|
ade671e |
*** ../vim-7.2.323/src/version.c 2009-12-24 16:11:24.000000000 +0100
|
|
|
ade671e |
--- src/version.c 2009-12-31 13:17:25.000000000 +0100
|
|
|
ade671e |
***************
|
|
|
ade671e |
*** 683,684 ****
|
|
|
ade671e |
--- 683,686 ----
|
|
|
ade671e |
{ /* Add new patch number below this line */
|
|
|
ade671e |
+ /**/
|
|
|
ade671e |
+ 324,
|
|
|
ade671e |
/**/
|
|
|
ade671e |
|
|
|
ade671e |
--
|
|
|
ade671e |
"Thou shalt not follow the Null Pointer, for at its end Chaos and
|
|
|
ade671e |
Madness lie."
|
|
|
ade671e |
|
|
|
ade671e |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
ade671e |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
ade671e |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
ade671e |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|