diff --git a/kdelibs-4.1.0-kcookiejar-crash.patch b/kdelibs-4.1.0-kcookiejar-crash.patch new file mode 100644 index 0000000..b8a0392 --- /dev/null +++ b/kdelibs-4.1.0-kcookiejar-crash.patch @@ -0,0 +1,12 @@ +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) ); diff --git a/kdelibs.spec b/kdelibs.spec index 4d06824..b347eaf 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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 @@ Patch19: kdelibs-4.0.98-revert-kinit-regression.patch # 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 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage ## upstream patches %patch100 -p1 -b .kde#167826 +%patch101 -p0 -b .kcookiejar-crash %build @@ -372,6 +375,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 10 2008 Kevin Kofler 4.1.0-5 +- fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure) + * Fri Aug 01 2008 Rex Dieter 4.1.0-4 - -devel: Requires: phonon-devel >= 4.2 (helps multilib upgrades) - konq processes never terminate (kde#167826, rh#457526)