Merged revisions 940769 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.2/kdepim

........
  r940769 | tmcguire | 2009-03-18 10:26:57 +0100 (Wed, 18 Mar 2009) | 8 lines
  
  Backport r940115 by tmcguire from trunk to the 4.2 branch:
  
  Make sure HTMl messages can not overwrite the header.
  
  CCBUG: 96557
  CCBUG: 96020
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=940863

objecttreeparser.cpp

@@ -253,6 +253,12 @@ namespace KMail {
       node->setProcessed( false, true );
     }
 
+    // Make sure the whole content is relative, so that nothing is painted over the header
+    // if a malicious message uses absolute positioning.
+    bool isRoot = ( node->parentNode() == 0 );
+    if ( isRoot && mReader )
+      htmlWriter()->queue( "<div style=\"position: relative\">\n" );
+
     for ( ; node ; node = node->nextSibling() ) {
       if ( node->processed() )
         continue;
@@ -300,6 +306,9 @@ namespace KMail {
       if ( showOnlyOneMimePart() )
         break;
     }
+
+    if ( isRoot && mReader )
+      htmlWriter()->queue( "</div>\n" );
   }
 
   void ObjectTreeParser::defaultHandling( partNode * node, ProcessResult & result ) {