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

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:25:53 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit e2c3001200064ae41a3754b93ac15ce85c3e8682
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 10 22:00:05 2004 +0000

    	Fix crash on abcnews.com by adding isEmpty checks before dereferencing.
    
            * khtml/html/htmltokenizer.cpp:
            (khtml::HTMLTokenizer::parseTag):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5e377d1..f81ca76 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2004-02-10  David Hyatt  <hyatt at apple.com>
 
+	Fix crash on abcnews.com by adding isEmpty checks before dereferencing.
+	
+        * khtml/html/htmltokenizer.cpp:
+        (khtml::HTMLTokenizer::parseTag):
+
+2004-02-10  David Hyatt  <hyatt at apple.com>
+
 	Improve attribute parsing of mapped attributes (that map to CSS properties) so that they can pull the
 	style declarations from a global cache.
 
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 7f88a69..f7de02c 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -867,10 +867,11 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                         // Fix bug 34302 at kde.bugs.org.  Go ahead and treat
                         // <!--> as a valid comment, since both mozilla and IE on windows
                         // can handle this case.  Only do this in quirks mode. -dwh
-                        if (*src == '>' && parser->doc()->inCompatMode()) {
+                        if (!src.isEmpty() && *src == '>' && parser->doc()->inCompatMode()) {
                           comment = false;
                           ++src;
-                          cBuffer[cBufferPos++] = src->cell();
+                          if (!src.isEmpty())
+                              cBuffer[cBufferPos++] = src->cell();
                         }
 		        else
                           parseComment(src);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list