Date: Fri, 13 Mar 2015 14:26:18 +0000 (UTC) From: Bartek Rutkowski <robak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381210 - in head/x11/slim: . files Message-ID: <201503131426.t2DEQItC017461@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503131426.t2DEQItC017461>