Fix crash, bug #292321, thank Phil Stracchino for report and Felipe Contreras for fix.

(Portage version: 2.2_rc60/cvs/Linux x86_64)

3 files changed, 39 insertions, 3 deletions

diff --git a/x11-plugins/msn-pecan/ChangeLog b/x11-plugins/msn-pecan/ChangeLog
index 21d68397c5ee..34275e7f4aeb 100644
--- a/x11-plugins/msn-pecan/ChangeLog
+++ b/x11-plugins/msn-pecan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/msn-pecan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/ChangeLog,v 1.2 2009/07/19 20:12:13 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/ChangeLog,v 1.3 2009/12/24 09:54:26 pva Exp $
+
+*msn-pecan-0.1.0_rc1-r1 (24 Dec 2009)
+
+  24 Dec 2009; Peter Volkov <pva@gentoo.org> -msn-pecan-0.1.0_rc1.ebuild,
+  +msn-pecan-0.1.0_rc1-r1.ebuild,
+  +files/msn-pecan-0.1.0_rc1-oim-crash.patch:
+  Fix crash, bug #292321, thank Phil Stracchino for report and Felipe
+  Contreras for fix.
 
 *msn-pecan-0.1.0_rc1 (19 Jul 2009)
 
diff --git a/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch b/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch
new file mode 100644
index 000000000000..0bdd60143438
--- /dev/null
+++ b/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch
@@ -0,0 +1,22 @@
+commit e0fa9a5bcc356ad20c359cf208bbc84f155cdb71
+Author: Simone Contini <s.contini@oltrelinux.com>
+Date:   Sun Dec 13 10:01:37 2009 +0100
+
+    oim: handle malformed data in process_body_receive
+    
+    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
+
+diff --git a/pn_oim.c b/pn_oim.c
+index 6faaabe..496e3c0 100644
+--- a/pn_oim.c
++++ b/pn_oim.c
+@@ -576,7 +576,8 @@ process_body_receive (OimRequest *oim_request,
+         gchar *end;
+         cur += 2;
+         end = strstr (cur, "\r\n\r\n");
+-        *end = '\0';
++        if (end)
++            *end = '\0';
+         message = (gchar *) purple_base64_decode (cur, NULL);
+     }
+ 
diff --git a/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1.ebuild b/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild
index 79a007c5afd0..cc4ee7c6d963 100644
--- a/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1.ebuild
+++ b/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1.ebuild,v 1.1 2009/07/19 20:12:13 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild,v 1.1 2009/12/24 09:54:26 pva Exp $
 
-inherit toolchain-funcs multilib
+EAPI="2"
+
+inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="Alternative MSN protocol plugin for libpurple"
 HOMEPAGE="http://code.google.com/p/msn-pecan/"
@@ -21,6 +23,10 @@ DEPEND="dev-util/pkgconfig
 
 S=${WORKDIR}/${P/_/-}
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-oim-crash.patch"
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" || die "emake failed"
 }