Fix memset argument (noticed by GCC).

(Portage version: 2.2.1_p20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

3 files changed, 44 insertions, 2 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 9a5e3ddbf673..a149853006ba 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.306 2013/09/12 19:55:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.307 2013/09/12 20:13:21 slyfox Exp $
+
+  12 Sep 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/proftpd-1.3.4d-memset-fix.patch, proftpd-1.3.4d.ebuild:
+  Fix memset argument (noticed by GCC).
 
 *proftpd-1.3.4d (12 Sep 2013)
 
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch b/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch
new file mode 100644
index 000000000000..9bec4d4d5804
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch
@@ -0,0 +1,37 @@
+From dfab55028b4282a8e8769e108518405a93cf3d87 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 12 Sep 2013 22:58:35 +0300
+Subject: [PATCH] contrib/mod_sftp_pam.c: fix size argument for memset
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Pass something string size related insteal of 'sizeof(void*)'
+(which might overflow).
+
+Found by gcc 4.8:
+> mod_sftp_pam.c:327:36: warning: argument to ‘sizeof’ in ‘memset’
+> call is the same expression as the destination; did you mean to
+> provide an explicit length? [-Wsizeof-pointer-memaccess]
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ contrib/mod_sftp_pam.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/mod_sftp_pam.c b/contrib/mod_sftp_pam.c
+index 0a9de72..ba8f1c5 100644
+--- a/contrib/mod_sftp_pam.c
++++ b/contrib/mod_sftp_pam.c
+@@ -324,7 +324,7 @@ static int sftppam_driver_open(sftp_kbdint_driver_t *driver, const char *user) {
+     exit(1);
+   }
+ 
+-  memset(sftppam_user, '\0', sizeof(sftppam_user));
++  memset(sftppam_user, '\0', sftppam_userlen);
+   sstrncpy(sftppam_user, user, sftppam_userlen);
+ 
+   c = find_config(main_server->conf, CONF_PARAM, "SFTPPAMOptions", FALSE);
+-- 
+1.8.3.2
+
diff --git a/net-ftp/proftpd/proftpd-1.3.4d.ebuild b/net-ftp/proftpd/proftpd-1.3.4d.ebuild
index c1e0da386864..3ad52f91bd3d 100644
--- a/net-ftp/proftpd/proftpd-1.3.4d.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4d.ebuild,v 1.1 2013/09/12 19:55:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4d.ebuild,v 1.2 2013/09/12 20:13:21 slyfox Exp $
 
 EAPI=5
 inherit eutils multilib systemd
@@ -72,6 +72,7 @@ __prepare_module() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-sftp-kbdint-max-responses-bug3973.patch
+	epatch "${FILESDIR}"/${P}-memset-fix.patch
 
 	# Skip 'install-conf' / Support LINGUAS
 	sed -i -e "/install-all/s/ install-conf//" Makefile.in