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

List:       kde-commits
Subject:    branches/KDE/4.5/kdelibs/khtml/html
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-11-27 17:30:36
Message-ID: 20101127173036.717B0AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1201413 by orlovich:

Merged revision:r1201412 | orlovich | 2010-11-27 12:28:50 -0500 (Sat, 27 Nov 2010) | 6 lines

Don't crash when someone (e.g. kmail) passes in some html w/o a KHTMLPart that contains 
a named iframe. It'd be best if HTMLQuoteColorer in kmail 4.4 were changed to use the 
part just in case, though. 

BUG: 257500

 M  +5 -0      html_baseimpl.cpp  


--- branches/KDE/4.5/kdelibs/khtml/html/html_baseimpl.cpp #1201412:1201413
@@ -274,6 +274,11 @@
     // if the natural one conflicts
     KHTMLPart* parentPart = document()->part();
 
+    // If there is no part, we will not load anything, so no 
+    // worry about names being unique or not.
+    if (!parentPart)
+        return;
+
     KHTMLPart* otherFrame = parentPart->findFrame( name.string() );
     if (name.isEmpty() || (otherFrame && otherFrame != contentPart()))
         name = DOMString(parentPart->requestFrameName());
[prev in list] [next in list] [prev in thread] [next in thread]