diff options
| author | root <root@rshg054.dnsready.net> | 2012-11-17 01:32:38 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-11-17 01:32:38 -0800 |
| commit | 071ecd58a9b69020ec170e7f89009a603e885371 (patch) | |
| tree | c32fc487de5e9afc5bb12c053775982fdd2c6b7d /extra/slim | |
| parent | 99c34471cedb5de3afae4e33c48239abbe1410c7 (diff) | |
Sat Nov 17 01:27:29 PST 2012
Diffstat (limited to 'extra/slim')
| -rw-r--r-- | extra/slim/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/slim/fix-array-overflow.patch | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 2b6055168..8c1872313 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169982 2012-10-30 23:00:16Z heftig $ +# $Id: PKGBUILD 171076 2012-11-16 14:05:41Z allan $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -21,13 +21,13 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'slim.service' 'session-name.patch' 'libpng-1.4+-support.patch' - 'fix-glibc-segfault-1.3.4.patch') + 'fix-array-overflow.patch') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../session-name.patch # FS#26693: fix default session name patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build - patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864 + patch -Np0 -i ../fix-array-overflow.patch # FS#30864 cd ${srcdir} mkdir build cd build diff --git a/extra/slim/fix-array-overflow.patch b/extra/slim/fix-array-overflow.patch new file mode 100644 index 000000000..b035f8a78 --- /dev/null +++ b/extra/slim/fix-array-overflow.patch @@ -0,0 +1,13 @@ +Index: app.cpp +=================================================================== +--- app.cpp (revision 223) ++++ app.cpp (working copy) +@@ -593,7 +593,7 @@ + + n++; + +- child_env = static_cast<char**>(malloc(sizeof(char*)*n)); ++ 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; |