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

List:       kde-commits
Subject:    branches/KDE/4.1/kdelibs/khtml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2008-08-22 17:37:57
Message-ID: 1219426677.188408.10825.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 850972 by orlovich:

Backport bugfixes from trunk:
r846699 by Matthias Grimrath --- fixes extra - in parsed comments
r842096 by Vir --- fixes assert-fail on parsing of some SSL-related commands



 M  +4 -1      html/htmltokenizer.cpp  
 M  +4 -2      java/kjavaappletserver.cpp  


--- branches/KDE/4.1/kdelibs/khtml/html/htmltokenizer.cpp #850971:850972
@@ -513,7 +513,10 @@
             {
                 if ( scriptCodeSize > 2 && scriptCode[scriptCodeSize-3] == '-' &&
                      scriptCode[scriptCodeSize-2] == '-' )
+                {
+                    scriptCodeSize -= 1;
                     scriptEnd=true;
+                }
             }
 
             if (canClose || handleBrokenComments || scriptEnd ){
@@ -1444,7 +1447,7 @@
             else if ( !brokenScript && tagID == ID_SCRIPT ) {
                 DOMStringImpl* a = 0;
                 bool foundTypeAttribute = false;
-                scriptSrc = scriptSrcCharset = QString();
+                scriptSrc.clear(); scriptSrcCharset.clear();
                 if ( currToken.attrs && /* potentially have a ATTR_SRC ? */
                      view &&  /* are we a regular tokenizer or just for innerHTML ? \
                */
                      parser->doc()->view()->part()->jScriptEnabled() /* jscript \
                allowed at all? */
--- branches/KDE/4.1/kdelibs/khtml/java/kjavaappletserver.cpp #850971:850972
@@ -652,10 +652,12 @@
                 answer = "nossl";
             } else if (args.size() > 2) {
                 const int certsnr = args[1].toInt();
+                Q_ASSERT(args.size() > certsnr + 1);
                 QString text;
                 QList<KSSLCertificate *> certs;
-                for (int i = certsnr; i >= 0; --i) {
-                    KSSLCertificate * cert = \
KSSLCertificate::fromString(args[i+2].toAscii().constData()); +                for \
(int i = certsnr - 1; i >= 0; --i) { +                    const QByteArray &arg = \
args[i + 2].toAscii(); +                    KSSLCertificate * cert = \
KSSLCertificate::fromString(arg.constData());  if (cert) {
                         certs.prepend(cert);
                         if (cert->isSigner())


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