From owner-svn-ports-head@FreeBSD.ORG  Fri Mar 13 14:26:18 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D2DEBF5F;
 Fri, 13 Mar 2015 14:26:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BDA7CFA1;
 Fri, 13 Mar 2015 14:26:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2DEQIWr017463;
 Fri, 13 Mar 2015 14:26:18 GMT (envelope-from robak@FreeBSD.org)
Received: (from robak@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2DEQItC017461;
 Fri, 13 Mar 2015 14:26:18 GMT (envelope-from robak@FreeBSD.org)
Message-Id: <201503131426.t2DEQItC017461@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: robak set sender to
 robak@FreeBSD.org using -f
From: Bartek Rutkowski <robak@FreeBSD.org>
Date: Fri, 13 Mar 2015 14:26:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381210 - in head/x11/slim: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Mar 2015 14:26:18 -0000

Author: robak
Date: Fri Mar 13 14:26:17 2015
New Revision: 381210
URL: https://svnweb.freebsd.org/changeset/ports/381210
QAT: https://qat.redports.org/buildarchive/r381210/

Log:
  x11/slim: fix malloc and memcpy arguments
  
  PR:		198465
  Submitted by:	Henry Hu <henry.hu.sh@gmail.com>

Modified:
  head/x11/slim/Makefile
  head/x11/slim/files/patch-app.cpp

Modified: head/x11/slim/Makefile
==============================================================================
--- head/x11/slim/Makefile	Fri Mar 13 14:02:58 2015	(r381209)
+++ head/x11/slim/Makefile	Fri Mar 13 14:26:17 2015	(r381210)
@@ -3,7 +3,7 @@
 
 PORTNAME=	slim
 PORTVERSION=	1.3.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.berlios.de/pub/slim/ \
 		SF/slim.berlios

Modified: head/x11/slim/files/patch-app.cpp
==============================================================================
--- head/x11/slim/files/patch-app.cpp	Fri Mar 13 14:02:58 2015	(r381209)
+++ head/x11/slim/files/patch-app.cpp	Fri Mar 13 14:26:17 2015	(r381210)
@@ -1,5 +1,5 @@
 --- app.cpp.orig	2013-10-01 18:38:05.000000000 -0400
-+++ app.cpp	2014-12-18 00:18:29.000000000 -0500
++++ app.cpp	2015-03-08 14:34:54.992147000 -0400
 @@ -14,6 +14,7 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -52,6 +52,17 @@
  #ifdef USE_PAM
  App::App(int argc, char** argv)
    : pam(conv, static_cast<void*>(&LoginPanel)),
+@@ -596,8 +627,8 @@
+ 
+ 		n++;
+ 
+-		child_env = static_cast<char**>(malloc(sizeof(char*)*n));
+-		memcpy(child_env, old_env, sizeof(char*)*n+1);
++		child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
++		memcpy(child_env, old_env, sizeof(char*)*n);
+ 		child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ 		child_env[n] = NULL;
+ # endif /* USE_CONSOLEKIT */
 @@ -627,6 +658,17 @@
  
  #endif