|
 |
5d1bb07 |
To: vim_dev@googlegroups.com
|
|
|
5d1bb07 |
Subject: Patch 7.3.156
|
|
|
5d1bb07 |
Fcc: outbox
|
|
|
5d1bb07 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
5d1bb07 |
Mime-Version: 1.0
|
|
|
5d1bb07 |
Content-Type: text/plain; charset=UTF-8
|
|
|
5d1bb07 |
Content-Transfer-Encoding: 8bit
|
|
|
5d1bb07 |
------------
|
|
|
5d1bb07 |
|
|
|
5d1bb07 |
Patch 7.3.156
|
|
|
5d1bb07 |
Problem: Tty names possibly left unterminated.
|
|
|
5d1bb07 |
Solution: Use vim_strncpy() instead of strncpy().
|
|
|
5d1bb07 |
Files: src/pty.c
|
|
|
5d1bb07 |
|
|
|
5d1bb07 |
|
|
|
5d1bb07 |
*** ../vim-7.3.155/src/pty.c 2010-08-15 21:57:28.000000000 +0200
|
|
|
5d1bb07 |
--- src/pty.c 2011-04-11 14:02:49.000000000 +0200
|
|
|
5d1bb07 |
***************
|
|
|
5d1bb07 |
*** 209,216 ****
|
|
|
5d1bb07 |
#ifdef _SEQUENT_
|
|
|
5d1bb07 |
fvhangup(s);
|
|
|
5d1bb07 |
#endif
|
|
|
5d1bb07 |
! strncpy(PtyName, m, sizeof(PtyName));
|
|
|
5d1bb07 |
! strncpy(TtyName, s, sizeof(TtyName));
|
|
|
5d1bb07 |
initmaster(f);
|
|
|
5d1bb07 |
*ttyn = TtyName;
|
|
|
5d1bb07 |
return f;
|
|
|
5d1bb07 |
--- 209,216 ----
|
|
|
5d1bb07 |
#ifdef _SEQUENT_
|
|
|
5d1bb07 |
fvhangup(s);
|
|
|
5d1bb07 |
#endif
|
|
|
5d1bb07 |
! vim_strncpy((char_u *)PtyName, (char_u *)m, sizeof(PtyName) - 1);
|
|
|
5d1bb07 |
! vim_strncpy((char_u *)TtyName, (char_u *)s, sizeof(TtyName) - 1);
|
|
|
5d1bb07 |
initmaster(f);
|
|
|
5d1bb07 |
*ttyn = TtyName;
|
|
|
5d1bb07 |
return f;
|
|
|
5d1bb07 |
***************
|
|
|
5d1bb07 |
*** 301,307 ****
|
|
|
5d1bb07 |
return -1;
|
|
|
5d1bb07 |
}
|
|
|
5d1bb07 |
signal(SIGCHLD, sigcld);
|
|
|
5d1bb07 |
! strncpy(TtyName, m, sizeof(TtyName));
|
|
|
5d1bb07 |
initmaster(f);
|
|
|
5d1bb07 |
*ttyn = TtyName;
|
|
|
5d1bb07 |
return f;
|
|
|
5d1bb07 |
--- 301,307 ----
|
|
|
5d1bb07 |
return -1;
|
|
|
5d1bb07 |
}
|
|
|
5d1bb07 |
signal(SIGCHLD, sigcld);
|
|
|
5d1bb07 |
! vim_strncpy((char_u *)TtyName, (char_u *)m, sizeof(TtyName) - 1);
|
|
|
5d1bb07 |
initmaster(f);
|
|
|
5d1bb07 |
*ttyn = TtyName;
|
|
|
5d1bb07 |
return f;
|
|
|
5d1bb07 |
***************
|
|
|
5d1bb07 |
*** 326,332 ****
|
|
|
5d1bb07 |
/* a dumb looking loop replaced by mycrofts code: */
|
|
|
5d1bb07 |
if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0)
|
|
|
5d1bb07 |
return -1;
|
|
|
5d1bb07 |
! strncpy(TtyName, ttyname(f), sizeof(TtyName));
|
|
|
5d1bb07 |
if (geteuid() != ROOT_UID && mch_access(TtyName, R_OK | W_OK))
|
|
|
5d1bb07 |
{
|
|
|
5d1bb07 |
close(f);
|
|
|
5d1bb07 |
--- 326,332 ----
|
|
|
5d1bb07 |
/* a dumb looking loop replaced by mycrofts code: */
|
|
|
5d1bb07 |
if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0)
|
|
|
5d1bb07 |
return -1;
|
|
|
5d1bb07 |
! vim_strncpy((char_u *)TtyName, (char_u *)ttyname(f), sizeof(TtyName) - 1);
|
|
|
5d1bb07 |
if (geteuid() != ROOT_UID && mch_access(TtyName, R_OK | W_OK))
|
|
|
5d1bb07 |
{
|
|
|
5d1bb07 |
close(f);
|
|
|
5d1bb07 |
*** ../vim-7.3.155/src/version.c 2011-04-11 13:46:07.000000000 +0200
|
|
|
5d1bb07 |
--- src/version.c 2011-04-11 14:23:38.000000000 +0200
|
|
|
5d1bb07 |
***************
|
|
|
5d1bb07 |
*** 716,717 ****
|
|
|
5d1bb07 |
--- 716,719 ----
|
|
|
5d1bb07 |
{ /* Add new patch number below this line */
|
|
|
5d1bb07 |
+ /**/
|
|
|
5d1bb07 |
+ 156,
|
|
|
5d1bb07 |
/**/
|
|
|
5d1bb07 |
|
|
|
5d1bb07 |
--
|
|
|
5d1bb07 |
I think that you'll agree that engineers are very effective in their social
|
|
|
5d1bb07 |
interactions. It's the "normal" people who are nuts.
|
|
|
5d1bb07 |
(Scott Adams - The Dilbert principle)
|
|
|
5d1bb07 |
|
|
|
5d1bb07 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
5d1bb07 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
5d1bb07 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
5d1bb07 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|