From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 11 Apr 2011 12:24:37 +0000 (+0200)
Subject: updated for version 7.3.156
X-Git-Tag: v7.3.156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=639304ddb1bcc70b67b3eaf50cefb30415526aa8;p=vim

updated for version 7.3.156
Problem:    Tty names possibly left unterminated.
Solution:   Use vim_strncpy() instead of strncpy().
---

diff --git a/src/pty.c b/src/pty.c
index 944eccfb9..bc28c0d9a 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -209,8 +209,8 @@ OpenPTY(ttyn)
 #ifdef _SEQUENT_
     fvhangup(s);
 #endif
-    strncpy(PtyName, m, sizeof(PtyName));
-    strncpy(TtyName, s, sizeof(TtyName));
+    vim_strncpy((char_u *)PtyName, (char_u *)m, sizeof(PtyName) - 1);
+    vim_strncpy((char_u *)TtyName, (char_u *)s, sizeof(TtyName) - 1);
     initmaster(f);
     *ttyn = TtyName;
     return f;
@@ -301,7 +301,7 @@ OpenPTY(ttyn)
 	return -1;
     }
     signal(SIGCHLD, sigcld);
-    strncpy(TtyName, m, sizeof(TtyName));
+    vim_strncpy((char_u *)TtyName, (char_u *)m, sizeof(TtyName) - 1);
     initmaster(f);
     *ttyn = TtyName;
     return f;
@@ -326,7 +326,7 @@ OpenPTY(ttyn)
     /* a dumb looking loop replaced by mycrofts code: */
     if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0)
 	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))
     {
 	close(f);
diff --git a/src/version.c b/src/version.c
index 3887e6258..b221404e1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    156,
 /**/
     155,
 /**/