From fc451b5b0fb8d7b3952ca6ecf91779cbcf00187f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 15 Apr 2015 09:15:23 +0200
Subject: gfapi: fix potential non-0-terminated string (CID 1134002)

Use correct target buffer length for strncpy and make
sure that the target string is 0 terminated.

Fixes Coverity ID 1134002.

Change-Id: I97a74a94a818eb08a711e547f2ac6ae46087f065
BUG: 789278
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-on: http://review.gluster.org/10247
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
---
 api/src/glfs-fops.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'api')

diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
index ba95e021ee2..de5be43f435 100644
--- a/api/src/glfs-fops.c
+++ b/api/src/glfs-fops.c
@@ -2062,7 +2062,8 @@ gf_dirent_to_dirent (gf_dirent_t *gf_dirent, struct dirent *dirent)
 	dirent->d_namlen = strlen (gf_dirent->d_name);
 #endif
 
-	strncpy (dirent->d_name, gf_dirent->d_name, GF_NAME_MAX + 1);
+	strncpy (dirent->d_name, gf_dirent->d_name, NAME_MAX);
+	dirent->d_name[NAME_MAX] = 0;
 }
 
 
-- 
cgit