[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2009-09-19 18:01:14
Message-ID: 1253383274.505946.26117.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1025798 by orlovich:

automatically merged revision 1025797:
Fix crash in runAdFilter --- take in account that when we're removing a node its kids \
 will be removed as well...

BUG: 192308

 M  +5 -1      khtml_part.cpp  


--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #1025797:1025798
@@ -6578,7 +6578,11 @@
             {
                 if ( KHTMLGlobal::defaultHTMLSettings()->isAdFiltered( \
d->m_doc->completeURL( static_cast<ElementImpl \
*>(node)->getAttribute(ATTR_SRC).string() ) ) )  {
-                    // We found an IMG, IFRAME or INPUT (of type IMAGE) matching a \
filter. +                    // Since any kids of node will be deleted, too, \
fastforward nextNode +                    // until we get outside of node.
+                    while (nextNode && nextNode->isAncestor(node))
+                        nextNode = nextNode->traverseNextNode();
+
                     node->ref();
                     NodeImpl *parent = node->parent();
                     if( parent )


[prev in list] [next in list] [prev in thread] [next in thread]