Changeset 245197 in webkit

Timestamp:

May 10, 2019, 2:36:45 PM (7 years ago)

Author:

ggaren@apple.com

Message:

Downgrade RELEASE_ASSERT TO RELEASE_LOG_FAULT for SQLite Class A files
​https://bugs.webkit.org/show_bug.cgi?id=197760

Reviewed by Jer Noble.

We have all the data we need, and this crash is happening more than
expected.

• platform/sql/SQLiteDatabase.cpp:

(WebCore::SQLiteDatabase::open):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/sql/SQLiteDatabase.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-09  Geoffrey Garen  <ggaren@apple.com>
+
+        Downgrade RELEASE_ASSERT TO RELEASE_LOG_FAULT for SQLite Class A files
+        https://bugs.webkit.org/show_bug.cgi?id=197760
+
+        Reviewed by Jer Noble.
+
+        We have all the data we need, and this crash is happening more than
+        expected.
+
+        * platform/sql/SQLiteDatabase.cpp:
+        (WebCore::SQLiteDatabase::open):
+
 2019-05-10  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp

@@ -151 +151 @@
 
     String shmFileName = makeString(filename, "-shm"_s);
-    if (FileSystem::fileExists(shmFileName))
-        RELEASE_ASSERT(FileSystem::isSafeToUseMemoryMapForPath(shmFileName));
+    if (FileSystem::fileExists(shmFileName)) {
+        if (!FileSystem::isSafeToUseMemoryMapForPath(shmFileName))
+            RELEASE_LOG_FAULT(SQLDatabase, "Opened an SQLite database with a Class A -shm file. This may trigger a crash when the user locks the device. (%s)", shmFileName.latin1().data());
+            FileSystem::makeSafeToUseMemoryMapForPath(shmFileName);
+    }
 
     return isOpen();