rev 5529 - in branches/etch/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2007-02-04 00:58:40 +0100 (Sun, 04 Feb 2007)
New Revision: 5529

Added:
   branches/etch/packages/kdelibs/debian/patches/25_khtml_non_existant_page_crash.diff
Modified:
   branches/etch/packages/kdelibs/debian/changelog
Log:
Fix khtml crash in etch too

Modified: branches/etch/packages/kdelibs/debian/changelog
===================================================================
--- branches/etch/packages/kdelibs/debian/changelog	2007-02-03 23:57:29 UTC (rev 5528)
+++ branches/etch/packages/kdelibs/debian/changelog	2007-02-03 23:58:40 UTC (rev 5529)
@@ -1,3 +1,13 @@
+kdelibs (4:3.5.5a.dfsg.1-7) unstable; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * New patch (No. 25) from KDE bug #128564. Fixes khtml crash on loading
+    some non existing pages when javascript is disabled (Closes: #408413).
+    Probably fixes these KDE bugs too: #126812, #127137, #135117, #138449.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun,  4 Feb 2007 00:21:17 +0200
+
 kdelibs (4:3.5.5a.dfsg.1-6) unstable; urgency=high
 
   +++ Changes by Modestas Vainius:

Added: branches/etch/packages/kdelibs/debian/patches/25_khtml_non_existant_page_crash.diff
===================================================================
--- branches/etch/packages/kdelibs/debian/patches/25_khtml_non_existant_page_crash.diff	2007-02-03 23:57:29 UTC (rev 5528)
+++ branches/etch/packages/kdelibs/debian/patches/25_khtml_non_existant_page_crash.diff	2007-02-03 23:58:40 UTC (rev 5529)
@@ -0,0 +1,11 @@
+--- khtml/khtml_part.cpp	2007-02-03 13:50:40.000000000 +0200
++++ khtml/khtml_part.cpp	2007-02-03 13:51:01.000000000 +0200
+@@ -1843,7 +1843,7 @@
+   }
+   KIO::TransferJob *tjob = ::qt_cast<KIO::TransferJob*>(job);
+   if (tjob && tjob->isErrorPage()) {
+-    khtml::RenderPart *renderPart = d->m_frame->m_frame;
++    khtml::RenderPart *renderPart = d->m_frame ? d->m_frame->m_frame : 0L;
+     if (renderPart) {
+       HTMLObjectElementImpl* elt = static_cast<HTMLObjectElementImpl *>(renderPart->element());
+       if (!elt)