nano

commit 67cdd5ee1edafbf51c46a1a3094f747e0e36984b
parent 92896a708d1912a5c527ae45f51b6ad5cc02c87d
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun,  1 Feb 2015 09:48:50 +0000

Making sure that 'lockprog' and 'lockuser' are properly terminated.
Patch by Kamil Dudka.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5109 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
2
++
M
src/files.c
 | 
2
+-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,8 @@
 2015-02-01  Kamil Dudka  <kdudka@redhat.com>
 	* src/files.c (write_lockfile): Avoid writing uninitialized bytes to
 	the lock file -- a simple null_at() would not initialize the buffer.
+	* src/files.c (do_lockfile): Make sure that 'lockprog' and 'lockuser'
+	are terminated -- strncpy() does not guarantee that on its own.
 
 2015-02-01  Benno Schulenberg  <bensberg@justemail.net>
 	* src/winio.c (do_credits): Add a general entry for all translators.
diff --git a/src/files.c b/src/files.c
@@ -253,7 +253,7 @@ int do_lockfile(const char *filename)
 		+ strlen(locking_suffix) + 3;
     char *lockfilename = charalloc(lockfilesize);
     char *lockfiledir = NULL;
-    char lockprog[12], lockuser[16];
+    static char lockprog[11], lockuser[17];
     struct stat fileinfo;
     int lockfd, lockpid;