Title: [245308] branches/safari-608.1.24-branch/Source/WebCore
- Revision
- 245308
- Author
- [email protected]
- Date
- 2019-05-14 14:07:51 -0700 (Tue, 14 May 2019)
Log 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
Modified Paths
Diff
Modified: branches/safari-608.1.24-branch/Source/WebCore/ChangeLog (245307 => 245308)
--- branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-14 21:07:48 UTC (rev 245307)
+++ branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-14 21:07:51 UTC (rev 245308)
@@ -1,5 +1,34 @@
2019-05-14 Alan Coon <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r245238. rdar://problem/49382250
[macOS] Font formatting options don't work when composing a message in Yahoo mail
Modified: branches/safari-608.1.24-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp (245307 => 245308)
--- branches/safari-608.1.24-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2019-05-14 21:07:48 UTC (rev 245307)
+++ branches/safari-608.1.24-branch/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2019-05-14 21:07:51 UTC (rev 245308)
@@ -151,9 +151,10 @@
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);
+ }
}
return isOpen();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
