|
 |
1cb839b |
To: vim-dev@vim.org
|
|
|
1cb839b |
Subject: patch 7.1.055
|
|
|
1cb839b |
Fcc: outbox
|
|
|
1cb839b |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1cb839b |
Mime-Version: 1.0
|
|
|
1cb839b |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
1cb839b |
Content-Transfer-Encoding: 8bit
|
|
|
1cb839b |
------------
|
|
|
1cb839b |
|
|
|
1cb839b |
Patch 7.1.055
|
|
|
1cb839b |
Problem: Using strcpy() with arguments that overlap.
|
|
|
1cb839b |
Solution: Use mch_memmove() instead.
|
|
|
1cb839b |
Files: src/buffer.c, src/charset.c, src/eval.c, src/ex_getln.c,
|
|
|
1cb839b |
src/misc1.c, src/regexp.c, src/termlib.c
|
|
|
1cb839b |
|
|
|
1cb839b |
|
|
|
1cb839b |
*** ../vim-7.1.054/src/buffer.c Tue Jun 19 15:40:51 2007
|
|
|
1cb839b |
--- src/buffer.c Sun Aug 5 16:14:03 2007
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 4860,4866 ****
|
|
|
1cb839b |
*/
|
|
|
1cb839b |
for (e = s; *e != ':' && *e != NUL; ++e)
|
|
|
1cb839b |
if (e[0] == '\\' && e[1] == ':')
|
|
|
1cb839b |
! STRCPY(e, e + 1);
|
|
|
1cb839b |
if (*e == NUL)
|
|
|
1cb839b |
end = TRUE;
|
|
|
1cb839b |
|
|
|
1cb839b |
--- 4860,4866 ----
|
|
|
1cb839b |
*/
|
|
|
1cb839b |
for (e = s; *e != ':' && *e != NUL; ++e)
|
|
|
1cb839b |
if (e[0] == '\\' && e[1] == ':')
|
|
|
1cb839b |
! mch_memmove(e, e + 1, STRLEN(e));
|
|
|
1cb839b |
if (*e == NUL)
|
|
|
1cb839b |
end = TRUE;
|
|
|
1cb839b |
|
|
|
1cb839b |
*** ../vim-7.1.054/src/charset.c Tue Mar 27 12:41:45 2007
|
|
|
1cb839b |
--- src/charset.c Sun Aug 5 21:53:44 2007
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 1898,1904 ****
|
|
|
1cb839b |
{
|
|
|
1cb839b |
for ( ; *p; ++p)
|
|
|
1cb839b |
if (rem_backslash(p))
|
|
|
1cb839b |
! STRCPY(p, p + 1);
|
|
|
1cb839b |
}
|
|
|
1cb839b |
|
|
|
1cb839b |
/*
|
|
|
1cb839b |
--- 1898,1904 ----
|
|
|
1cb839b |
{
|
|
|
1cb839b |
for ( ; *p; ++p)
|
|
|
1cb839b |
if (rem_backslash(p))
|
|
|
1cb839b |
! mch_memmove(p, p + 1, STRLEN(p));
|
|
|
1cb839b |
}
|
|
|
1cb839b |
|
|
|
1cb839b |
/*
|
|
|
1cb839b |
*** ../vim-7.1.054/src/eval.c Fri Jul 27 21:32:13 2007
|
|
|
1cb839b |
--- src/eval.c Sun Aug 5 16:25:03 2007
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 13807,13813 ****
|
|
|
1cb839b |
}
|
|
|
1cb839b |
/* Shorten "remain". */
|
|
|
1cb839b |
if (*q != NUL)
|
|
|
1cb839b |
! STRCPY(remain, q - 1);
|
|
|
1cb839b |
else
|
|
|
1cb839b |
{
|
|
|
1cb839b |
vim_free(remain);
|
|
|
1cb839b |
--- 13807,13813 ----
|
|
|
1cb839b |
}
|
|
|
1cb839b |
/* Shorten "remain". */
|
|
|
1cb839b |
if (*q != NUL)
|
|
|
1cb839b |
! mch_memmove(remain, q - 1, STRLEN(q - 1) + 1);
|
|
|
1cb839b |
else
|
|
|
1cb839b |
{
|
|
|
1cb839b |
vim_free(remain);
|
|
|
1cb839b |
*** ../vim-7.1.054/src/ex_getln.c Sat Jul 28 14:21:04 2007
|
|
|
1cb839b |
--- src/ex_getln.c Sun Aug 5 21:55:56 2007
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 4306,4315 ****
|
|
|
1cb839b |
&& pat[i + 1] == '\\'
|
|
|
1cb839b |
&& pat[i + 2] == '\\'
|
|
|
1cb839b |
&& pat[i + 3] == ' ')
|
|
|
1cb839b |
! STRCPY(pat + i, pat + i + 3);
|
|
|
1cb839b |
if (xp->xp_backslash == XP_BS_ONE
|
|
|
1cb839b |
&& pat[i + 1] == ' ')
|
|
|
1cb839b |
! STRCPY(pat + i, pat + i + 1);
|
|
|
1cb839b |
}
|
|
|
1cb839b |
}
|
|
|
1cb839b |
|
|
|
1cb839b |
--- 4306,4316 ----
|
|
|
1cb839b |
&& pat[i + 1] == '\\'
|
|
|
1cb839b |
&& pat[i + 2] == '\\'
|
|
|
1cb839b |
&& pat[i + 3] == ' ')
|
|
|
1cb839b |
! mch_memmove(pat + i, pat + i + 3,
|
|
|
1cb839b |
! STRLEN(pat + i + 3) + 1);
|
|
|
1cb839b |
if (xp->xp_backslash == XP_BS_ONE
|
|
|
1cb839b |
&& pat[i + 1] == ' ')
|
|
|
1cb839b |
! mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i));
|
|
|
1cb839b |
}
|
|
|
1cb839b |
}
|
|
|
1cb839b |
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 4552,4558 ****
|
|
|
1cb839b |
pat = vim_strsave(filepat);
|
|
|
1cb839b |
for (i = 0; pat[i]; ++i)
|
|
|
1cb839b |
if (pat[i] == '\\' && pat[i + 1] == ' ')
|
|
|
1cb839b |
! STRCPY(pat + i, pat + i + 1);
|
|
|
1cb839b |
|
|
|
1cb839b |
flags |= EW_FILE | EW_EXEC;
|
|
|
1cb839b |
|
|
|
1cb839b |
--- 4553,4559 ----
|
|
|
1cb839b |
pat = vim_strsave(filepat);
|
|
|
1cb839b |
for (i = 0; pat[i]; ++i)
|
|
|
1cb839b |
if (pat[i] == '\\' && pat[i + 1] == ' ')
|
|
|
1cb839b |
! mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i));
|
|
|
1cb839b |
|
|
|
1cb839b |
flags |= EW_FILE | EW_EXEC;
|
|
|
1cb839b |
|
|
|
1cb839b |
*** ../vim-7.1.054/src/misc1.c Sat Aug 4 12:14:04 2007
|
|
|
1cb839b |
--- src/misc1.c Sun Aug 5 21:57:15 2007
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 8635,8641 ****
|
|
|
1cb839b |
for (p = buf + wildoff; p < s; ++p)
|
|
|
1cb839b |
if (rem_backslash(p))
|
|
|
1cb839b |
{
|
|
|
1cb839b |
! STRCPY(p, p + 1);
|
|
|
1cb839b |
--e;
|
|
|
1cb839b |
--s;
|
|
|
1cb839b |
}
|
|
|
1cb839b |
--- 8635,8641 ----
|
|
|
1cb839b |
for (p = buf + wildoff; p < s; ++p)
|
|
|
1cb839b |
if (rem_backslash(p))
|
|
|
1cb839b |
{
|
|
|
1cb839b |
! mch_memmove(p, p + 1, STRLEN(p));
|
|
|
1cb839b |
--e;
|
|
|
1cb839b |
--s;
|
|
|
1cb839b |
}
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 8936,8942 ****
|
|
|
1cb839b |
for (p = buf + wildoff; p < s; ++p)
|
|
|
1cb839b |
if (rem_backslash(p))
|
|
|
1cb839b |
{
|
|
|
1cb839b |
! STRCPY(p, p + 1);
|
|
|
1cb839b |
--e;
|
|
|
1cb839b |
--s;
|
|
|
1cb839b |
}
|
|
|
1cb839b |
--- 8936,8942 ----
|
|
|
1cb839b |
for (p = buf + wildoff; p < s; ++p)
|
|
|
1cb839b |
if (rem_backslash(p))
|
|
|
1cb839b |
{
|
|
|
1cb839b |
! mch_memmove(p, p + 1, STRLEN(p));
|
|
|
1cb839b |
--e;
|
|
|
1cb839b |
--s;
|
|
|
1cb839b |
}
|
|
|
1cb839b |
*** ../vim-7.1.054/src/regexp.c Mon Jul 30 22:32:11 2007
|
|
|
1cb839b |
--- src/regexp.c Sun Aug 5 15:43:27 2007
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 6637,6645 ****
|
|
|
1cb839b |
}
|
|
|
1cb839b |
}
|
|
|
1cb839b |
else if (magic)
|
|
|
1cb839b |
! STRCPY(p, p + 1); /* remove '~' */
|
|
|
1cb839b |
else
|
|
|
1cb839b |
! STRCPY(p, p + 2); /* remove '\~' */
|
|
|
1cb839b |
--p;
|
|
|
1cb839b |
}
|
|
|
1cb839b |
else
|
|
|
1cb839b |
--- 6638,6646 ----
|
|
|
1cb839b |
}
|
|
|
1cb839b |
}
|
|
|
1cb839b |
else if (magic)
|
|
|
1cb839b |
! mch_memmove(p, p + 1, STRLEN(p)); /* remove '~' */
|
|
|
1cb839b |
else
|
|
|
1cb839b |
! mch_memmove(p, p + 2, STRLEN(p) - 1); /* remove '\~' */
|
|
|
1cb839b |
--p;
|
|
|
1cb839b |
}
|
|
|
1cb839b |
else
|
|
|
1cb839b |
*** ../vim-7.1.054/src/termlib.c Thu May 10 20:20:59 2007
|
|
|
1cb839b |
--- src/termlib.c Sun Aug 5 21:52:41 2007
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 191,197 ****
|
|
|
1cb839b |
lbuf[0] == '\t' &&
|
|
|
1cb839b |
lbuf[1] == ':')
|
|
|
1cb839b |
{
|
|
|
1cb839b |
! strcpy(lbuf, lbuf+2);
|
|
|
1cb839b |
llen -= 2;
|
|
|
1cb839b |
}
|
|
|
1cb839b |
if (lbuf[llen-2] == '\\') /* and continuations */
|
|
|
1cb839b |
--- 191,197 ----
|
|
|
1cb839b |
lbuf[0] == '\t' &&
|
|
|
1cb839b |
lbuf[1] == ':')
|
|
|
1cb839b |
{
|
|
|
1cb839b |
! mch_memmove(lbuf, lbuf + 2, strlen(lbuf + 2) + 1);
|
|
|
1cb839b |
llen -= 2;
|
|
|
1cb839b |
}
|
|
|
1cb839b |
if (lbuf[llen-2] == '\\') /* and continuations */
|
|
|
1cb839b |
*** ../vim-7.1.054/src/version.c Sun Aug 5 20:10:16 2007
|
|
|
1cb839b |
--- src/version.c Mon Aug 6 21:34:54 2007
|
|
|
1cb839b |
***************
|
|
|
1cb839b |
*** 668,669 ****
|
|
|
1cb839b |
--- 668,671 ----
|
|
|
1cb839b |
{ /* Add new patch number below this line */
|
|
|
1cb839b |
+ /**/
|
|
|
1cb839b |
+ 55,
|
|
|
1cb839b |
/**/
|
|
|
1cb839b |
|
|
|
1cb839b |
--
|
|
|
1cb839b |
From "know your smileys":
|
|
|
1cb839b |
% Bike accident. A bit far-fetched, I suppose; although...
|
|
|
1cb839b |
o _ _ _
|
|
|
1cb839b |
_o /\_ _ \\o (_)\__/o (_)
|
|
|
1cb839b |
_< \_ _>(_) (_)/<_ \_| \ _|/' \/
|
|
|
1cb839b |
(_)>(_) (_) (_) (_) (_)' _\o_
|
|
|
1cb839b |
|
|
|
1cb839b |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1cb839b |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1cb839b |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
1cb839b |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|