[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 38d4462149b337d8dc9bd0e2fbdf39adda5359ab
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 5 05:52:14 2010 +0000

    2010-03-04  John Gregg  <johnnyg at google.com>
    
            Reviewed by Darin Fisher.
    
            [chromium] WebDocument:applicationID() crashes on <meta> tag with no http-equiv attribute
            https://bugs.webkit.org/show_bug.cgi?id=35771
    
            * src/WebDocument.cpp:
            (WebKit::WebDocument::applicationID):
            check for presence of http-equiv attribute before lower()ing it.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55571 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a4778d9..955a40f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-04  John Gregg  <johnnyg at google.com>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] WebDocument:applicationID() crashes on <meta> tag with no http-equiv attribute
+        https://bugs.webkit.org/show_bug.cgi?id=35771
+
+        * src/WebDocument.cpp:
+        (WebKit::WebDocument::applicationID):
+        check for presence of http-equiv attribute before lower()ing it.
+
 2010-03-04  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebKit/chromium/src/WebDocument.cpp b/WebKit/chromium/src/WebDocument.cpp
index e6144de..8515685 100644
--- a/WebKit/chromium/src/WebDocument.cpp
+++ b/WebKit/chromium/src/WebDocument.cpp
@@ -149,10 +149,9 @@ WebString WebDocument::applicationID() const
         const_cast<Document*>(document)->getElementsByTagName("meta");
     for (unsigned i = 0; i < metaTags->length(); ++i) {
         Element* element = static_cast<Element*>(metaTags->item(i));
-        if (element->getAttribute("http-equiv").lower() ==
-                kChromeApplicationHeader) {
+        if (element->hasAttribute("http-equiv")
+            && element->getAttribute("http-equiv").lower() == kChromeApplicationHeader)
             return element->getAttribute("value");
-        }
     }
 
     return WebString();

-- 
WebKit Debian packaging