aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.156

Browse Source 
Problem:    Tty names possibly left unterminated.
Solution:   Use vim_strncpy() instead of strncpy().
This commit is contained in:
Bram Moolenaar 2011-04-11 14:24:37 +02:00
parent 32f649e1fc
commit 639304ddb1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pty.c
View File

@ -209,8 +209,8 @@ OpenPTY(ttyn)
#ifdef _SEQUENT_ #ifdef _SEQUENT_
fvhangup(s); fvhangup(s);
#endif #endif
strncpy(PtyName, m, sizeof(PtyName)); vim_strncpy((char_u *)PtyName, (char_u *)m, sizeof(PtyName) - 1);
strncpy(TtyName, s, sizeof(TtyName)); vim_strncpy((char_u *)TtyName, (char_u *)s, sizeof(TtyName) - 1);
initmaster(f); initmaster(f);
*ttyn = TtyName; *ttyn = TtyName;
return f; return f;
@ -301,7 +301,7 @@ OpenPTY(ttyn)
return -1; return -1;
} }
signal(SIGCHLD, sigcld); signal(SIGCHLD, sigcld);
strncpy(TtyName, m, sizeof(TtyName)); vim_strncpy((char_u *)TtyName, (char_u *)m, sizeof(TtyName) - 1);
initmaster(f); initmaster(f);
*ttyn = TtyName; *ttyn = TtyName;
return f; return f;
@ -326,7 +326,7 @@ OpenPTY(ttyn)
/* a dumb looking loop replaced by mycrofts code: */ /* a dumb looking loop replaced by mycrofts code: */
if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0) if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0)
return -1; return -1;
strncpy(TtyName, ttyname(f), sizeof(TtyName)); vim_strncpy((char_u *)TtyName, (char_u *)ttyname(f), sizeof(TtyName) - 1);
if (geteuid() != ROOT_UID && mch_access(TtyName, R_OK | W_OK)) if (geteuid() != ROOT_UID && mch_access(TtyName, R_OK | W_OK))
{ {
close(f); close(f);

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
156,
/**/ /**/
155, 155,
/**/ /**/