Reviewed by Adam.

        Return E_INVALIDARG if the databaseName BSTR is null;

        * WebDatabaseManager.cpp:
        (WebDatabaseManager::detailsForDatabaseWithOrigin):
        (WebDatabaseManager::deleteDatabaseWithOrigin):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 615e4cde76cc59e77dd5cda0d45a965349956036..9a74ba3e9e28199883d1dfa3ea02b89224f53dcd 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-27  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam.
+
+        Return E_INVALIDARG if the databaseName BSTR is null;
+        
+        * WebDatabaseManager.cpp:
+        (WebDatabaseManager::detailsForDatabaseWithOrigin):
+        (WebDatabaseManager::deleteDatabaseWithOrigin):
+
 2007-11-27  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Adam.

diff --git a/WebKit/win/WebDatabaseManager.cpp b/WebKit/win/WebDatabaseManager.cpp
index 6ba632c1902e639108000bbb56e04f6c22c70160..b8ab195378b297eb0b466d559dfdee79266df562 100644 (file)
--- a/WebKit/win/WebDatabaseManager.cpp
+++ b/WebKit/win/WebDatabaseManager.cpp
@@ -245,7 +245,7 @@ HRESULT STDMETHODCALLTYPE WebDatabaseManager::detailsForDatabaseWithOrigin(
     /* [in] */ IWebSecurityOrigin* origin,\r
     /* [retval][out] */ IPropertyBag** result)\r
 {\r
-    if (!databaseName || !origin || !result)\r
+    if (!origin || !result)\r
         return E_POINTER;\r
 \r
     *result = 0;\r
@@ -299,9 +299,12 @@ HRESULT STDMETHODCALLTYPE WebDatabaseManager::deleteDatabaseWithOrigin(
     /* [in] */ BSTR databaseName,\r
     /* [in] */ IWebSecurityOrigin* origin)\r
 {\r
-    if (!databaseName || !origin)\r
+    if (!origin)\r
         return E_POINTER;\r
 \r
+    if (!databaseName)\r
+        return E_INVALIDARG;\r
+\r
     if (this != s_sharedWebDatabaseManager)\r
         return E_FAIL;\r
 \r