[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dumi at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit aa1f1995987a6b0016ae829fd1fae39f8e98d297
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 13 21:09:21 2010 +0000

    Refactoring DatabaseAuthorizer to use a CaseFoldingHash function
    for the set of whitelisted sqlite functions, and fixing some
    indenting issues.
    
    Reviewed by Darin Adler.
    
    https://bugs.webkit.org/show_bug.cgi?id=33612
    
    * storage/DatabaseAuthorizer.cpp:
    (WebCore::DatabaseAuthorizer::allowFunction):
    * storage/DatabaseAuthorizer.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53198 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 38bd156..c4db241 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-13  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Refactoring DatabaseAuthorizer to use a CaseFoldingHash function
+        for the set of whitelisted sqlite functions, and fixing some
+        indenting issues.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33612
+
+        * storage/DatabaseAuthorizer.cpp:
+        (WebCore::DatabaseAuthorizer::allowFunction):
+        * storage/DatabaseAuthorizer.h:
+
 2010-01-13  Carol Szabo  <carol.szabo at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/storage/DatabaseAuthorizer.cpp b/WebCore/storage/DatabaseAuthorizer.cpp
index d065480..d87d4d9 100644
--- a/WebCore/storage/DatabaseAuthorizer.cpp
+++ b/WebCore/storage/DatabaseAuthorizer.cpp
@@ -344,10 +344,10 @@ int DatabaseAuthorizer::allowDetach(const String&)
 
 int DatabaseAuthorizer::allowFunction(const String& functionName)
 {
-  if (m_securityEnabled && !m_whitelistedFunctions.contains(functionName.lower()))
-    return SQLAuthDeny;
+    if (m_securityEnabled && !m_whitelistedFunctions.contains(functionName))
+        return SQLAuthDeny;
 
-  return SQLAuthAllow;
+    return SQLAuthAllow;
 }
 
 void DatabaseAuthorizer::disable()
diff --git a/WebCore/storage/DatabaseAuthorizer.h b/WebCore/storage/DatabaseAuthorizer.h
index 2171561..037409e 100644
--- a/WebCore/storage/DatabaseAuthorizer.h
+++ b/WebCore/storage/DatabaseAuthorizer.h
@@ -104,7 +104,7 @@ private:
     bool m_lastActionChangedDatabase : 1;
     bool m_readOnly : 1;
 
-    HashSet<String> m_whitelistedFunctions;
+    HashSet<String, CaseFoldingHash> m_whitelistedFunctions;
 };
 
 } // namespace WebCore

-- 
WebKit Debian packaging