rpms/purple-msn-pecan/F-11 purple-msn-pecan-handle_malformed_data.patch, NONE, 1.1 purple-msn-pecan.spec, 1.5, 1.6

[madko]

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7296

Modified Files:
	purple-msn-pecan.spec 
Added Files:
	purple-msn-pecan-handle_malformed_data.patch 
Log Message:
Patch to handle malformed data (bz #547078)


purple-msn-pecan-handle_malformed_data.patch:
 pn_oim.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE purple-msn-pecan-handle_malformed_data.patch ---
diff -Naur msn-pecan-0.1.0-rc1.orig/pn_oim.c msn-pecan-0.1.0-rc1/pn_oim.c
--- msn-pecan-0.1.0-rc1.orig/pn_oim.c	2009-07-19 13:10:53.000000000 +0200
+++ msn-pecan-0.1.0-rc1/pn_oim.c	2009-12-18 10:11:11.000000000 +0100
@@ -465,7 +465,8 @@
         gchar *end;
         cur += 2;
         end = strstr (cur, "\r\n\r\n");
-        *end = '\0';
+	if (end)
+		*end = '\0';
         message = (gchar *) purple_base64_decode (cur, NULL);
     }
 


Index: purple-msn-pecan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-11/purple-msn-pecan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- purple-msn-pecan.spec	11 Aug 2009 13:33:06 -0000	1.5
+++ purple-msn-pecan.spec	19 Dec 2009 12:55:44 -0000	1.6
@@ -1,13 +1,17 @@
 %define		realname msn-pecan
 Name:		purple-%{realname}
 Version:	0.1.0
-Release:	0.1.rc1%{?dist}
+Release:	0.3.rc1%{?dist}
 Summary:	Alternative MSN protocol plugin for libpurple 
 
 Group:		Applications/Internet 
 License:	GPLv2+
 URL:		http://code.google.com/p/msn-pecan/ 
 Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}-rc1.tar.bz2
+
+# Upstream has applied this patch see http://groups.google.com/group/msn-pecan/browse_thread/thread/3df8df31f2faa25b?pli=1
+Patch0:		purple-msn-pecan-handle_malformed_data.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel 
@@ -40,7 +44,7 @@ Other features:
 
 %prep
 %setup -q -n %{realname}-%{version}-rc1
-
+%patch0 -p1 -b malformed_data.rej
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes
@@ -70,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.3.rc1
+- patch to handle malformed data was not complete (bz #547836)
+
+* Mon Dec 14 2009 Edouard Bourguignon <madko at linuxed.net> - 0.1.0-0.2.rc1
+- Add Simone Contini's patch to handle malformed data in process_body_receive (bz #547078)
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.1.0-0.1.rc1
 - Update to 0.1.0-rc1.