Changeset 249053 in webkit

Timestamp:

Aug 23, 2019, 10:53:14 AM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r248967. rdar://problem/54643456

Crash under StringImpl::endsWith() in RegistrationDatabase::openSQLiteDatabase()
​https://bugs.webkit.org/show_bug.cgi?id=200991
<rdar://problem/54566689>

Reviewed by Geoffrey Garen.

Make sure we call isolatedCopy() on RegistrationDatabase::m_databaseDirectory before using
it from background threads.

• workers/service/server/RegistrationDatabase.cpp: (WebCore::RegistrationDatabase::openSQLiteDatabase): (WebCore::RegistrationDatabase::clearAll):
• workers/service/server/RegistrationDatabase.h: (WebCore::RegistrationDatabase::databaseDirectory const):

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

Location:

branches/safari-608-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/server/RegistrationDatabase.cpp (modified) (3 diffs)
• workers/service/server/RegistrationDatabase.h (modified) (1 diff)

branches/safari-608-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-23  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r248967. rdar://problem/54643456
+
+    Crash under StringImpl::endsWith() in RegistrationDatabase::openSQLiteDatabase()
+    https://bugs.webkit.org/show_bug.cgi?id=200991
+    <rdar://problem/54566689>
+    
+    Reviewed by Geoffrey Garen.
+    
+    Make sure we call isolatedCopy() on RegistrationDatabase::m_databaseDirectory before using
+    it from background threads.
+    
+    * workers/service/server/RegistrationDatabase.cpp:
+    (WebCore::RegistrationDatabase::openSQLiteDatabase):
+    (WebCore::RegistrationDatabase::clearAll):
+    * workers/service/server/RegistrationDatabase.h:
+    (WebCore::RegistrationDatabase::databaseDirectory const):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248967 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-21  Chris Dumez  <cdumez@apple.com>
+
+            Crash under StringImpl::endsWith() in RegistrationDatabase::openSQLiteDatabase()
+            https://bugs.webkit.org/show_bug.cgi?id=200991
+            <rdar://problem/54566689>
+
+            Reviewed by Geoffrey Garen.
+
+            Make sure we call isolatedCopy() on RegistrationDatabase::m_databaseDirectory before using
+            it from background threads.
+
+            * workers/service/server/RegistrationDatabase.cpp:
+            (WebCore::RegistrationDatabase::openSQLiteDatabase):
+            (WebCore::RegistrationDatabase::clearAll):
+            * workers/service/server/RegistrationDatabase.h:
+            (WebCore::RegistrationDatabase::databaseDirectory const):
+
 2019-08-22  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608-branch/Source/WebCore/workers/service/server/RegistrationDatabase.cpp

@@ -131 +131 @@
     ASSERT(!m_database);
 
-    cleanOldDatabases(m_databaseDirectory);
+    auto databaseDirectory = this->databaseDirectory();
+    cleanOldDatabases(databaseDirectory);
 
     LOG(ServiceWorker, "ServiceWorker RegistrationDatabase opening file %s", fullFilename.utf8().data());
@@ -151 +152 @@
     });
 
-    SQLiteFileSystem::ensureDatabaseDirectoryExists(m_databaseDirectory);
+    SQLiteFileSystem::ensureDatabaseDirectoryExists(databaseDirectory);
 
     m_database = std::make_unique<SQLiteDatabase>();
@@ -300 +301 @@
 
         SQLiteFileSystem::deleteDatabaseFile(m_databaseFilePath);
-        SQLiteFileSystem::deleteEmptyDatabaseDirectory(m_databaseDirectory);
+        SQLiteFileSystem::deleteEmptyDatabaseDirectory(databaseDirectory());
 
         callOnMainThread(WTFMove(completionHandler));

branches/safari-608-branch/Source/WebCore/workers/service/server/RegistrationDatabase.h

@@ -60 +60 @@
 private:
     RegistrationDatabase(RegistrationStore&, String&& databaseDirectory);
+    
+    String databaseDirectory() const { return m_databaseDirectory.isolatedCopy(); }
 
     void postTaskToWorkQueue(Function<void()>&&);