Changeset 52554 in webkit

Timestamp:

Dec 24, 2009 7:25:10 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2009-12-24 Shinichiro Hamaji <​hamaji@chromium.org>

Unreviewed Chromium test fix by reverting r52536.

Do not a new Database pointer to any structure until its version has been verified
​https://bugs.webkit.org/show_bug.cgi?id=32913

• storage/Database.cpp: (WebCore::Database::openDatabase): (WebCore::Database::Database): (WebCore::Database::performOpenAndVerify):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• storage/Database.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-24  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Unreviewed Chromium test fix by reverting r52536.
+
+        Do not a new Database pointer to any structure until its version has been verified
+        https://bugs.webkit.org/show_bug.cgi?id=32913
+
+        * storage/Database.cpp:
+        (WebCore::Database::openDatabase):
+        (WebCore::Database::Database):
+        (WebCore::Database::performOpenAndVerify):
+
 2009-12-24  Jessie Berlin  <jberlin@webkit.org>
 

trunk/WebCore/storage/Database.cpp

@@ -133 +133 @@
     if (!database->openAndVerifyVersion(e)) {
        LOG(StorageAPI, "Failed to open and verify version (expected %s) of database %s", expectedVersion.ascii().data(), database->databaseDebugName().ascii().data());
+       document->removeOpenDatabase(database.get());
+       DatabaseTracker::tracker().removeOpenDatabase(database.get());
        return 0;
     }
-
-    DatabaseTracker::tracker().addOpenDatabase(database.get());
-    document->addOpenDatabase(database.get());
 
     DatabaseTracker::tracker().setDatabaseDetails(document->securityOrigin(), name, displayName, estimatedSize);
@@ -190 +189 @@
 
     m_filename = DatabaseTracker::tracker().fullPathForDatabase(m_mainThreadSecurityOrigin.get(), m_name);
+
+    DatabaseTracker::tracker().addOpenDatabase(this);
+    m_document->addOpenDatabase(this);
 }
 
@@ -460 +462 @@
         return false;
     }
+
+    m_opened = true;
+    if (m_document->databaseThread())
+        m_document->databaseThread()->recordDatabaseOpen(this);
 
     ASSERT(m_databaseAuthorizer);
@@ -520 +526 @@
     }
 
-    m_opened = true;
-    if (m_document->databaseThread())
-        m_document->databaseThread()->recordDatabaseOpen(this);
-
     return true;
 }