[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2f32d860f5e598210ee02e17883bdfe847bbe698
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 04:57:03 2010 +0000

    2010-08-13  Adam Barth  <abarth at webkit.org>
    
            Fix ASSERT in XML entity parsing.  You can't advance the entity search
            if you've already discovered that your string is not an entity.
    
            * html/HTMLEntityParser.cpp:
            (WebCore::decodeNamedEntity):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65354 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 94ec035..cd61bcc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-13  Adam Barth  <abarth at webkit.org>
+
+        Fix ASSERT in XML entity parsing.  You can't advance the entity search
+        if you've already discovered that your string is not an entity.
+
+        * html/HTMLEntityParser.cpp:
+        (WebCore::decodeNamedEntity):
+
 2010-08-13  Eric Seidel  <eric at webkit.org>
 
         Unreviewed.  Attempt at fixing Chromium build.
diff --git a/WebCore/html/HTMLEntityParser.cpp b/WebCore/html/HTMLEntityParser.cpp
index af3b9f3..cf2b0ce 100644
--- a/WebCore/html/HTMLEntityParser.cpp
+++ b/WebCore/html/HTMLEntityParser.cpp
@@ -238,8 +238,11 @@ unsigned consumeHTMLEntity(SegmentedString& source, bool& notEnoughCharacters, U
 UChar decodeNamedEntity(const char* name)
 {
     HTMLEntitySearch search;
-    while (name && search.isEntityPrefix())
+    while (*name) {
         search.advance(*name++);
+        if (!search.isEntityPrefix())
+            return 0;
+    }
     search.advance(';');
     UChar32 entityValue = search.currentValue();
     if (U16_LENGTH(entityValue) != 1) {

-- 
WebKit Debian packaging