rev 5526 - in trunk/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2007-02-03 23:17:39 +0100 (Sat, 03 Feb 2007)
New Revision: 5526

Added:
   trunk/packages/kdelibs/debian/patches/25_khtml_non_existant_page_crash.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
Marc Haber experienced khtml crashes with the backtrace similar in kde bug #138449 when opening the following url: http://yapig.sourceforge.net/demo/photos/photos2291.html
He has confirmed, that the patch from kde bug #128564 fixed the problem.
KDE bugs #126812, #127137, #135117 look related and might be resolved by this patch too.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2007-02-03 18:18:53 UTC (rev 5525)
+++ trunk/packages/kdelibs/debian/changelog	2007-02-03 22:17:39 UTC (rev 5526)
@@ -6,12 +6,15 @@
 
   * Fix the bug of KDE 3.5.6 - an annoying issue with konqueror scrolling to the top
     of the old page before loading a new one. Patch from upstream svn (22nd patch).
+  * Apply patch from KDE bug #128564. Fixes khtml crash when java is
+    disabled and non existing page is loaded. Probably fixes these KDE bugs
+    too: #126812, #127137, #135117, #138449. debian/patches no. 25
 
   +++ Changes by Sune Vuorela
 
   * Bump shlibs.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Jan 2007 19:47:51 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat,  3 Feb 2007 13:54:21 +0200
 
 kdelibs (4:3.5.6.r1.dfsg.1-1) experimental; urgency=low
 

Added: trunk/packages/kdelibs/debian/patches/25_khtml_non_existant_page_crash.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/25_khtml_non_existant_page_crash.diff	2007-02-03 18:18:53 UTC (rev 5525)
+++ trunk/packages/kdelibs/debian/patches/25_khtml_non_existant_page_crash.diff	2007-02-03 22:17:39 UTC (rev 5526)
@@ -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)