Revbump. Fix buffer overflow.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

3 files changed, 38 insertions, 3 deletions

diff --git a/dev-libs/libxdg-basedir/ChangeLog b/dev-libs/libxdg-basedir/ChangeLog
index a8bd8725fbe7..92e27d9749b6 100644
--- a/dev-libs/libxdg-basedir/ChangeLog
+++ b/dev-libs/libxdg-basedir/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libxdg-basedir
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxdg-basedir/ChangeLog,v 1.37 2014/04/16 07:06:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxdg-basedir/ChangeLog,v 1.38 2014/04/16 20:56:57 idl0r Exp $
+
+*libxdg-basedir-1.2.0-r1 (16 Apr 2014)
+
+  16 Apr 2014; Christian Ruppert <idl0r@gentoo.org>
+  -libxdg-basedir-1.2.0.ebuild, +libxdg-basedir-1.2.0-r1.ebuild,
+  +files/libxdg-basedir-1.2.0-buffer-overflow.patch:
+  Revbump. Fix buffer overflow.
 
   16 Apr 2014; Lars Wendler <polynomial-c@gentoo.org>
   libxdg-basedir-1.2.0.ebuild:
diff --git a/dev-libs/libxdg-basedir/files/libxdg-basedir-1.2.0-buffer-overflow.patch b/dev-libs/libxdg-basedir/files/libxdg-basedir-1.2.0-buffer-overflow.patch
new file mode 100644
index 000000000000..4cd601cbde54
--- /dev/null
+++ b/dev-libs/libxdg-basedir/files/libxdg-basedir-1.2.0-buffer-overflow.patch
@@ -0,0 +1,26 @@
+From 14e000f696ef8b83264b0ca4407669bdb365fb23 Mon Sep 17 00:00:00 2001
+From: Timmy Weerwag <timmy@timmyweerwag.nl>
+Date: Sun, 16 Mar 2014 17:54:14 +0100
+Subject: [PATCH] Overflow bug
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ src/basedir.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basedir.c b/src/basedir.c
+index 68ab879..1a2a8c4 100644
+--- a/src/basedir.c
++++ b/src/basedir.c
+@@ -574,7 +574,7 @@ static char * xdgGetRelativeHome(const char *envname, const char *relativefallba
+ 		unsigned int homelen;
+ 		if (!(home = xdgGetEnv("HOME")))
+ 			return NULL;
+-		if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength))) return NULL;
++		if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength+1))) return NULL;
+ 		memcpy(relhome, home, homelen);
+ 		memcpy(relhome+homelen, relativefallback, fallbacklength+1);
+ 	}
+-- 
+1.8.3.2
+
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index 578753ecc685..b58c22945f51 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0.ebuild,v 1.2 2014/04/16 07:06:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild,v 1.1 2014/04/16 20:56:57 idl0r Exp $
 
 EAPI=5
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="Small library to access XDG Base Directories Specification paths"
 HOMEPAGE="http://repo.or.cz/w/libxdg-basedir.git"
@@ -20,6 +20,8 @@ DEPEND="doc? ( app-doc/doxygen )"
 S="${WORKDIR}/${PN}-${P}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-buffer-overflow.patch"
+
 	eautoreconf
 }