rpms/kdelibs/F-9 kdelibs-4.1.0-kcookiejar-crash.patch, NONE, 1.1 kdelibs.spec, 1.336, 1.337

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30004/F-9

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.0-kcookiejar-crash.patch 
Log Message:
* Sun Aug 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-5
- fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure)

kdelibs-4.1.0-kcookiejar-crash.patch:

--- NEW FILE kdelibs-4.1.0-kcookiejar-crash.patch ---
Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
--- kioslave/http/kcookiejar/kcookiejar.cpp	(revision 844311)
+++ kioslave/http/kcookiejar/kcookiejar.cpp	(working copy)
@@ -1367,6 +1367,7 @@ bool KCookieJar::loadCookies(const QStri
                 continue;
 
             const char *host( parseField(line) );
+            if (!host) continue;
             const char *domain( parseField(line) );
             const char *path( parseField(line) );
             const char *expStr( parseField(line) );


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- kdelibs.spec	1 Aug 2008 14:05:20 -0000	1.336
+++ kdelibs.spec	10 Aug 2008 15:59:59 -0000	1.337
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -85,6 +85,8 @@
 # konq processes never terminate, 
 # http://bugs.kde.org/167825 , http://bugzilla.redhat.com/457526
 Patch100: kdelibs-4.1.0-kde#167826.patch
+# fix kcookiejar crash on invalid cookie file from KDE 3
+Patch101: kdelibs-4.1.0-kcookiejar-crash.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -211,6 +213,7 @@
 
 ## upstream patches
 %patch100 -p1 -b .kde#167826
+%patch101 -p0 -b .kcookiejar-crash
 
 
 %build
@@ -372,6 +375,9 @@
 
 
 %changelog
+* Sun Aug 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-5
+- fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure)
+
 * Fri Aug 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-4
 - -devel: Requires: phonon-devel >= 4.2 (helps multilib upgrades)
 - konq processes never terminate (kde#167826, rh#457526)