[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-03-25 2:35:24
Message-ID: 1143254124.601866.17874.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 522305 by ggarand:

pff I suck... better check the queue size before merging.


 M  +3 -3      htmltokenizer.cpp  


--- branches/KDE/3.5/kdelibs/khtml/html/htmltokenizer.cpp #522304:522305
@@ -426,7 +426,7 @@
         src.append(pendingQueue.pop());
     } else if ( cachedScript.isEmpty() ) {
         write( pendingQueue.pop(), false );
-    } else if ( !deferredScript ) {
+    } else if ( !deferredScript && pendingQueue.count() > 1) {
        TokenizerString t = pendingQueue.pop();
        pendingQueue.top().prepend( t );
     }
@@ -1739,10 +1739,10 @@
         // scriptHandler(). In that case scriptHandler() will take care
         // of 'scriptOutput'.
         if ( !script ) {
-            if (!done) {
+            if (!done && pendingQueue.count() > 1) {
                TokenizerString t = pendingQueue.pop();
                pendingQueue.top().prepend( t );
-            } else {
+            } else if (done) {
                 write(pendingQueue.pop(), false);
             }
             // we might be deleted at this point, do not
[prev in list] [next in list] [prev in thread] [next in thread]