Changeset 223423 in webkit

Timestamp:

Oct 16, 2017, 12:21:07 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

We should wrap the removal of information from the tracker database in a transaction in DatabaseTracker::deleteOrigin()
​https://bugs.webkit.org/show_bug.cgi?id=178274
<rdar://problem/34576132>

Patch by Maureen Daum <​mdaum@apple.com> on 2017-10-16
Reviewed by Tim Horton.

• Modules/webdatabase/DatabaseTracker.cpp:

(WebCore::DatabaseTracker::deleteOrigin):
Wrap the removal of information from the tracker database in a transaction so that
we don't end up in a case where only one of the tables contains information about
an origin.
If anything goes wrong when we're modifying the tracker database, rollback the transaction
before bailing.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webdatabase/DatabaseTracker.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-16  Maureen Daum  <mdaum@apple.com>
+
+        We should wrap the removal of information from the tracker database in a transaction in DatabaseTracker::deleteOrigin()
+        https://bugs.webkit.org/show_bug.cgi?id=178274
+        <rdar://problem/34576132>
+
+        Reviewed by Tim Horton.
+
+        * Modules/webdatabase/DatabaseTracker.cpp:
+        (WebCore::DatabaseTracker::deleteOrigin):
+        Wrap the removal of information from the tracker database in a transaction so that
+        we don't end up in a case where only one of the tables contains information about
+        an origin.
+        If anything goes wrong when we're modifying the tracker database, rollback the transaction
+        before bailing.
+
 2017-10-16  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp

@@ -43 +43 @@
 #include "SQLiteFileSystem.h"
 #include "SQLiteStatement.h"
+#include "SQLiteTransaction.h"
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
@@ -843 +844 @@
         doneDeletingOrigin(origin);
 
+        SQLiteTransaction transaction(m_database);
+        transaction.begin();
+
         SQLiteStatement statement(m_database, "DELETE FROM Databases WHERE origin=?");
         if (statement.prepare() != SQLITE_OK) {
@@ -868 +872 @@
             return false;
         }
+
+        transaction.commit();
 
         SQLiteFileSystem::deleteEmptyDatabaseDirectory(originPath(origin));