[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:13:10 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 118364c5a58be638f80034af08df751307d410ef
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 17 23:40:27 2003 +0000

            Reviewed by John.
    
            - fixed 3485925: Safari does not correctly parse eight-digit hex character entities
    
            * khtml/html/htmltokenizer.cpp: (HTMLTokenizer::parseEntity): Replaced puzzling variable limit
            on number of hexadecimal characters to parse with an 8-character limit.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 950217c..af6e299 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,15 @@
 
         Reviewed by John.
 
+        - fixed 3485925: Safari does not correctly parse eight-digit hex character entities
+
+        * khtml/html/htmltokenizer.cpp: (HTMLTokenizer::parseEntity): Replaced puzzling variable limit
+        on number of hexadecimal characters to parse with an 8-character limit.
+
+2003-11-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
         - fixed 3485572 -- secure form check in KHTML uses case-sensitive comparison with "https"
 
         * khtml/html/html_formimpl.h:
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index fdcd301..02c3380 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -731,20 +731,19 @@ void HTMLTokenizer::parseEntity(DOMStringIt &src, QChar *&dest, bool start)
 
         case Hexadecimal:
         {
-            int ll = kMin(src.length(), 9-cBufferPos);
+            int ll = kMin(src.length(), 8);
             while(ll--) {
                 QChar csrc(src->lower());
                 cc = csrc.cell();
 
                 if(csrc.row() || !((cc >= '0' && cc <= '9') || (cc >= 'a' && cc <= 'f'))) {
-                    Entity = SearchSemicolon;
                     break;
                 }
                 EntityUnicodeValue = EntityUnicodeValue*16 + (cc - ( cc < 'a' ? '0' : 'a' - 10));
                 cBuffer[cBufferPos++] = cc;
                 ++src;
             }
-            if(cBufferPos == 9) Entity = SearchSemicolon;
+            Entity = SearchSemicolon;
             break;
         }
         case Decimal:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list