Changeset 245308 in webkit

Timestamp:

May 14, 2019, 2:07:51 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r245253. rdar://problem/50628434

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.

Only makeSafeToUseMemoryMapForPath() if needed. (Fixed missing brace.)

• platform/sql/SQLiteDatabase.cpp: (WebCore::SQLiteDatabase::open):

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

Location:

branches/safari-608.1.24-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2019-05-14  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r245253. rdar://problem/50628434
+
+    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.
+    
+    Only makeSafeToUseMemoryMapForPath() if needed. (Fixed missing brace.)
+    
+    * platform/sql/SQLiteDatabase.cpp:
+    (WebCore::SQLiteDatabase::open):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-13  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.
+
+            Only makeSafeToUseMemoryMapForPath() if needed. (Fixed missing brace.)
+
+            * platform/sql/SQLiteDatabase.cpp:
+            (WebCore::SQLiteDatabase::open):
+
 2019-05-14  Alan Coon  <alancoon@apple.com>
 

branches/safari-608.1.24-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp

@@ -152 +152 @@
     String shmFileName = makeString(filename, "-shm"_s);
     if (FileSystem::fileExists(shmFileName)) {
-        if (!FileSystem::isSafeToUseMemoryMapForPath(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);
+        }
     }