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

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 42 insertions, 5 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/Manifest b/x11-plugins/msn-pecan/Manifest
index f6ca7075b790..fa328a5566d3 100644
--- a/x11-plugins/msn-pecan/Manifest
+++ b/x11-plugins/msn-pecan/Manifest
@@ -1,6 +1,7 @@
+AUX msn-pecan-0.1.0_rc1-oim-crash.patch 643 RMD160 6d6e49dd7df5146aabb7c8f3ebd40dd0847927cf SHA1 8f451777312775fd46ca4363704cd3b36f229d52 SHA256 41b147ff90f8e43ba90ec115903ffa72a9afc8d2d8d7fedbaa95432148720c67
 DIST msn-pecan-0.0.19.tar.bz2 182250 RMD160 3dd560414cfe6e614dc53ce84c72dd62ef3fef3c SHA1 54b5ec219afd4fe5926db0fc6f2b79ef64302dce SHA256 f06bebffa4ed7eca8336437444c6fc0812499266eefe3c6afd48114442483f84
 DIST msn-pecan-0.1.0-rc1.tar.bz2 235687 RMD160 b4e6c9c04e75547a956859fbb108f3ae08598ccf SHA1 c0cda6950d51467d879184ed2d790086afca9c6b SHA256 c788fab679c0151103c430de96268e8414c59a0b5416b67484cdadf939712bba
 EBUILD msn-pecan-0.0.19.ebuild 1005 RMD160 c13edb75491aa60cf5ffe386956ea01e14778762 SHA1 f1c70dab18b8f4f99fbf7febe306650dd986672a SHA256 d2a114c80c877580a7d08539ca65ad242ca6017dc36d438c17d1e1b998e8d428
-EBUILD msn-pecan-0.1.0_rc1.ebuild 1025 RMD160 861eee915e3435220cdec1ea29ab428dbe091566 SHA1 34e9a4458cc64bd6b23fea9fe1959bb61f54a793 SHA256 d088f3f9d624d6b76028722d9358ab2ff30a36b8c3b59dec01b6f3c2000f1c25
-MISC ChangeLog 2465 RMD160 90ea6309202d5031543e0d5da7093df176b27296 SHA1 ccf6585a03399b9918db4ec279417ec59fd5f82f SHA256 4d37175181cdb79f3358df48483d8cabd56347ddb067505a6dfa692d29f443de
+EBUILD msn-pecan-0.1.0_rc1-r1.ebuild 1102 RMD160 d1ae9350106bfdfb269746a083200e087255f808 SHA1 9d92e1ae491c43aa577f05786864a2e9f3ad81bd SHA256 2af9afda121fd083472deb5d95dff34786d01c6771441093d49d4622b5d404c0
+MISC ChangeLog 2745 RMD160 4c6b1dd1a145c72fb207984a7fbc13d9b79f5f69 SHA1 0181c24ddb8e6aafc7307e11f24eb8f45d30a220 SHA256 64231a74fc712bd0081cb5de252b249fe7b4b1163f2aa2d1e88752ae7175c270
 MISC metadata.xml 341 RMD160 5bb2b4c4781b23adb3a40e8edda38e865a4fd4d8 SHA1 16eac5fa02391028710af4874bb4d92c37713f01 SHA256 aa464010ab31a9aa05aa2e01536f11c225cba6615b8ea3c7a7abb916f1fc8a2f
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"
 }