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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/html
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2006-06-21 13:37:45
Message-ID: 1150897065.572537.24160.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 553547 by ggarand:

.don't clobber whatever content is left in the Tokenizer source string when setting a new string
.don't let scriptHandler flush any queue when the current script has been filtered out or disallowed

Hopefully closes this horrible script handling Pandora box for good..

BUG:128566



 M  +9 -3      htmltokenizer.cpp  


--- branches/KDE/3.5/kdelibs/khtml/html/htmltokenizer.cpp #553546:553547
@@ -414,6 +414,9 @@
             setSrc(TokenizerString());
             scriptCodeSize = scriptCodeResync = 0;
             scriptExecution( exScript, QString::null, tagStartLineno /*scriptStartLineno*/ );
+        } else {
+            // script was filtered or disallowed
+            effectiveScript = false;
         }
     }
 
@@ -428,8 +431,8 @@
     } else if ( cachedScript.isEmpty() ) {
         write( pendingQueue.pop(), false );
     } else if ( !deferredScript && pendingQueue.count() > 1) {
-       TokenizerString t = pendingQueue.pop();
-       pendingQueue.top().prepend( t );
+        TokenizerString t = pendingQueue.pop();
+        pendingQueue.top().prepend( t );
     }
 }
 
@@ -1318,7 +1321,10 @@
         return;
     }
 
-    setSrc(str);
+    if (!src.isEmpty())
+        src.append(str);
+    else
+        setSrc(str);
     m_abort = false;
 
 //     if (Entity)
[prev in list] [next in list] [prev in thread] [next in thread]